OSDN Git Service

am d2236e2c: Merge "Fix Mac build."
authorElliott Hughes <enh@google.com>
Thu, 13 Sep 2012 18:09:49 +0000 (11:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Sep 2012 18:09:49 +0000 (11:09 -0700)
commit8db4b91bd2a069b2afb377f7e5190f625c3002cf
tree25a2ec65c3d4497fc31a392d930ee32b3e9a31b8
parentb2550dd4c85845974bf61d3e4071b2b957fbcf09
parentd2236e2c0717818e150215b4eee7af58cd3540d8
am d2236e2c: Merge "Fix Mac build."

* commit 'd2236e2c0717818e150215b4eee7af58cd3540d8':
  Fix Mac build.