OSDN Git Service

am 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com...
authorLorenzo Colitti <lorenzo@google.com>
Thu, 12 Mar 2015 08:00:53 +0000 (08:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Mar 2015 08:00:53 +0000 (08:00 +0000)
commit4a61eaf784fb085e66a21e9e4d4fa8aeb6b41c2b
tree0b1144f0dcccc225e4daacab60cc939f16308f8b
parentb6b9fe216d4dab6249e77870a02589e58d6bc59f
parent1c24b3f110e0521a3840c3dfce9a86343fa02672
am 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"

* commit '1c24b3f110e0521a3840c3dfce9a86343fa02672':
  Fix build, broken by https://android-review.googlesource.com/#/c/115890/