am 4c02d76b: (-s ours) am 719051f9: Merge "core/binary.mk: Add missing...
am 4c02d76b: (-s ours) am 719051f9: Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE" into gingerbread
* commit '4c02d76b':
core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE