OSDN Git Service

am 96c55282: am d8b9218c: am 9d0497bd: am 44da08ed: (-s ours) am b659b4c7: Merge...
authorWonsik Kim <wonsik@google.com>
Thu, 17 Sep 2015 23:15:11 +0000 (23:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2015 23:15:11 +0000 (23:15 +0000)
commit7334b956547b4ea780f759931770be411ecdad88
treecee73e41079ee48b1abc34575c4c245e6a3e7874
parent3f7ecd9bc53869d95466b7a583e7804c86b9eeee
parent96c5528258878d59a929a4b33e2e4b012197e335
am 96c55282: am d8b9218c: am 9d0497bd: am 44da08ed: (-s ours) am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev

* commit '96c5528258878d59a929a4b33e2e4b012197e335':
  DO NOT MERGE fix build