OSDN Git Service

am bb64d2fb: am 21b14554: am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build...
authorJeff Tinker <jtinker@google.com>
Fri, 21 Aug 2015 19:17:50 +0000 (19:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 19:17:50 +0000 (19:17 +0000)
commit52a9a61bd0a213c250bf2e61b66353259d729cfc
tree78aea84412b7abd2190379a762a486d7f9bbf5b4
parent186993d738ec3b3c9229f97a5ede86250ff54cfa
parentbb64d2fb9e458c9bde66dbc79d88462b7db2b652
am bb64d2fb: am 21b14554: am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE

* commit 'bb64d2fb9e458c9bde66dbc79d88462b7db2b652':
  Fix build break DO NOT MERGE