tree 75fe9d8202267613b645d54eee0b4bfd28052004
parent f5b7571291bc77797689fd8b4e918f736f3b4c41
parent 929e2f101620087c3ffbd6c214286c0b1348154b
author David 'Digit' Turner <digit@android.com> 1302558610 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302558610 -0700

am 929e2f10: am 4fc035aa: am 9909e7f5: am b24b2470: Merge "Really fix the Mac SDK build this time. Doh."

* commit '929e2f101620087c3ffbd6c214286c0b1348154b':
  Really fix the Mac SDK build this time. Doh.