OSDN Git Service

am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE
authorJeff Tinker <jtinker@google.com>
Fri, 21 Aug 2015 19:05:58 +0000 (19:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 19:05:58 +0000 (19:05 +0000)
commit21b14554c2c74ff81a381de3ddf893d8ea411161
treeeacc4c3d81ae6bb7b7e6c5c483a6f170a0dbdd30
parent9c9f862065c736bafdb9fc35dc126a59083d58b2
parente4a9d859e10930f187fc037e0a1cc8d1eb5c21c5
am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE

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