OSDN Git Service

am 1190e0e4: Merge "Fix mac build"
authorDave Allison <dallison@google.com>
Sat, 12 Jul 2014 01:42:13 +0000 (01:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 12 Jul 2014 01:42:13 +0000 (01:42 +0000)
commit026658d5da328108761a1586cabc339917e565ba
tree31f86937961622469a80ac238147df142a80465e
parent5731206b6443eb90b6b16573c4592393e7ceb0db
parent1190e0e48ae9f60383c02e1c30f3b9a7b01d5de4
am 1190e0e4: Merge "Fix mac build"

* commit '1190e0e48ae9f60383c02e1c30f3b9a7b01d5de4':
  Fix mac build