OSDN Git Service

am 8f04539e: (-s ours) Fix build
authorAlan Viverette <alanv@google.com>
Sat, 7 Jun 2014 12:26:17 +0000 (12:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 7 Jun 2014 12:26:17 +0000 (12:26 +0000)
commitbc0fbaebec174e9058fb57e77466ca8481a889de
treeda88b33003886b3a75b303763cfc464e379eec72
parentc42ef37e2822e95e28162fb1477e332052ff4b39
parente6a4613cf3cfbcca14736cd97b9f8ba7bc01d1f0
am 8f04539e: (-s ours) Fix build

* commit '8f04539ef2c88bdaf9c89bd14b7c23d30ad8ba09':
  Fix build