OSDN Git Service

am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE
authorJeff Tinker <jtinker@google.com>
Fri, 21 Aug 2015 18:59:11 +0000 (18:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 18:59:11 +0000 (18:59 +0000)
commite4a9d859e10930f187fc037e0a1cc8d1eb5c21c5
tree849d18a0d5ad54470904bfbfe7e24004ede61cb3
parentf8bf4acb505d8058e75b8b6f19738ee2c9a4322e
parentca095ac251ad02ad745d763f37ec3fcc5a8aa2ea
am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE

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