OSDN Git Service

am 4329b3ce: am 026658d5: am 1190e0e4: Merge "Fix mac build"
authorDave Allison <dallison@google.com>
Mon, 14 Jul 2014 20:40:46 +0000 (20:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jul 2014 20:40:46 +0000 (20:40 +0000)
commit45aba63dfd2fbd184b9f452ed23dc9932c515451
tree3dc5aaa74f1272c357d339c3c61d7e1ed0aececf
parent020d7b501b5a1344b21c22891877cf901013ba34
parent4329b3cecc611cc733b01ea26f04711dd31a3be1
am 4329b3ce: am 026658d5: am 1190e0e4: Merge "Fix mac build"

* commit '4329b3cecc611cc733b01ea26f04711dd31a3be1':