OSDN Git Service

am bd6b5dd3: Merge "Revert "Fix mac build""
authorNicolas Geoffray <ngeoffray@google.com>
Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)
* commit 'bd6b5dd3ce0f4d5454334d4848a97b00120b235e':
  Revert "Fix mac build"


Trivial merge