tree dc29ac6f22347d9ecbfdddd0471911c0e9defbb4
parent 4280891dbc2cf60bdf51726e0aa9265ccb64ec88
parent 7a4d92af9bdcf94d770bfa8313ad5b21c829ed96
author Jean-Baptiste Queru <jbq@google.com> 1329933279 -0800
committer android code review <noreply-gerritcodereview@google.com> 1329933280 -0800

Merge "Xcode 4.3 compatibility checkin"