OSDN Git Service

am 276565c8: am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
authorJason Sams <jsams@google.com>
Thu, 13 Mar 2014 18:08:31 +0000 (18:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 18:08:31 +0000 (18:08 +0000)
commit440613f5c35577f9a5bbc087b2e306e37bb8f94e
treed3991073f15b8526db2208527864ba0284b287a6
parent21f97de0bc4871cd8759aa8edbf55eb97d4a6ff2
parent276565c83c05e24819454dea4008ad5096792e4f
am 276565c8: am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.

* commit '276565c83c05e24819454dea4008ad5096792e4f':
  Force merge of remaining KLP changes to fix build.