tree dbce00adddf03393818c59e8446eda38e6fd6d1b
parent 2018726aeb9a40b84670483d5e6ef381f662ddd9
parent 84d13f373f031641743c4b08156529b8754a32a8
author Jean-Baptiste Queru <jbq@google.com> 1336148364 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336148364 -0700

am 84d13f37: Merge "Xcode 4.3 compatibility checkin"

* commit '84d13f373f031641743c4b08156529b8754a32a8':
  Xcode 4.3 compatibility checkin