tree 0e4fb77ad4687db1af4c6466023f8e257aa101f1
parent 62ac521c615d44e6a39fb986a0a2bd260ebdf55d
parent 6bd20ca22a4483cd75eb3e66682ec830d8688852
author David 'Digit' Turner <digit@android.com> 1302558608 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302558608 -0700

am 6bd20ca2: am f0f9b1bd: am ca7616f2: am d5106417: Merge "Fix Mac sdk builds"

* commit '6bd20ca22a4483cd75eb3e66682ec830d8688852':
  Fix Mac sdk builds