tree cae5dbc6389100267123fb5d1445a164ec79322f
parent e8fa72b3fa0acff025d46b75a23a3a8a19e9a4f5
parent 34e3d0291b767807e55022688463bdef96569462
author Al Sutton <al@funkyandroid.com> 1324514906 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1324514906 -0800

am 34e3d029: am 87879839: Fix build on MacOS 10.7 / XCode 4

* commit '34e3d0291b767807e55022688463bdef96569462':
  Fix build on MacOS 10.7 / XCode 4