tree 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
parent 080176c5ba47b0696faf08c602c47d2284002158
parent 7e7e13303de01df0f17cb92337ea33fa439d5f96
author Jean-Baptiste Queru <jbq@google.com> 1329934644 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329934644 -0800

am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"

* commit '2d03a93ecf00fb43272364293a21f88720884ce2':
  Xcode 4.3 compatibility checkin