OSDN Git Service

am 05eb2b37: am bd6b5dd3: Merge "Revert "Fix mac build""
authorNicolas Geoffray <ngeoffray@google.com>
Sat, 12 Jul 2014 02:06:13 +0000 (02:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 12 Jul 2014 02:06:13 +0000 (02:06 +0000)
commit31c07b12f94a0e4813366abda5b2d28895674560
treeac2892c108fcf7603b69c550283b2d3c67b45e36
parent175b716b04ea252694c08a1fdad31ae36e4d73c1
parent05eb2b372a910bf684b71c5e8da254e22706d420
am 05eb2b37: am bd6b5dd3: Merge "Revert "Fix mac build""

* commit '05eb2b372a910bf684b71c5e8da254e22706d420':
  Revert "Fix mac build"