OSDN Git Service

am 026658d5: am 1190e0e4: Merge "Fix mac build"
authorDave Allison <dallison@google.com>
Sat, 12 Jul 2014 02:06:09 +0000 (02:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 12 Jul 2014 02:06:09 +0000 (02:06 +0000)
commit4329b3cecc611cc733b01ea26f04711dd31a3be1
tree56d6ddc4ed1c48093a0834003a638e9c9e52f282
parentd0718b4dc71c471055ba77912a43cfbaca2432e6
parent026658d5da328108761a1586cabc339917e565ba
am 026658d5: am 1190e0e4: Merge "Fix mac build"

* commit '026658d5da328108761a1586cabc339917e565ba':
  Fix mac build