tree 22281d2edf52465ecc2ae33e83d6f0fb1d29f4be
parent afb902be6710d240bec3d98bd81d97dfb286ffdb
parent 32916f7a22f2abf5c1e7021f44c2337ca172f2e5
author Jean-Baptiste Queru <jbq@google.com> 1330028555 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330028555 -0800

am 32916f7a: am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"

* commit '32916f7a22f2abf5c1e7021f44c2337ca172f2e5':
  Xcode 4.3 compatibility checkin