tree 3495028896cf4aa9f918e019e1ebd682b79750fb
parent ee85edaf74adfc962ff0281b24aa7aa65a4eff1b
parent a2e05ead45f57030aa86a82bbaf891f28f7d5a58
author Jean-Baptiste Queru <jbq@google.com> 1336180346 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336180346 -0700

am a2e05ead: am 3e60e44f: Merge "Xcode 4.3 compatibility checkin"

* commit 'a2e05ead45f57030aa86a82bbaf891f28f7d5a58':
  Xcode 4.3 compatibility checkin