OSDN Git Service

am fba83719: Merge "Fix more of the Mac build."
authorDave Allison <dallison@google.com>
Mon, 11 Aug 2014 19:28:02 +0000 (19:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Aug 2014 19:28:02 +0000 (19:28 +0000)
commitf2ab796f48d1d0770aeaa8a0772ec429078e950b
treea52a5f13064b92a0a78a04a380e32fc21a977216
parent5eb9c8613b392731b5b7537707a4c6aa31695f88
parentfba83719dddaa5043c6c6f21e1000ca2faeaea39
am fba83719: Merge "Fix more of the Mac build."

* commit 'fba83719dddaa5043c6c6f21e1000ca2faeaea39':
  Fix more of the Mac build.