OSDN Git Service

am 21b14554: am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO...
authorJeff Tinker <jtinker@google.com>
Fri, 21 Aug 2015 19:13:44 +0000 (19:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 19:13:44 +0000 (19:13 +0000)
commitbb64d2fb9e458c9bde66dbc79d88462b7db2b652
tree78aea84412b7abd2190379a762a486d7f9bbf5b4
parent4bbd52382c6eab0b5f2de1ccdfb8da619e40deb7
parent21b14554c2c74ff81a381de3ddf893d8ea411161
am 21b14554: am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE

* commit '21b14554c2c74ff81a381de3ddf893d8ea411161':
  Fix build break DO NOT MERGE