OSDN Git Service

am 440613f5: am 276565c8: am 0ebc6b37: (-s ours) Force merge of remaining KLP changes...
authorJason Sams <jsams@google.com>
Fri, 14 Mar 2014 00:22:45 +0000 (00:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 00:22:45 +0000 (00:22 +0000)
commit3bab28f9e98fb8e2aae8e170bebe0070b7abb3bb
tree4bf123f5deaf0a702347ef63b0f398bcaa4c521b
parenta9b8bf053ca5a1e81160422a38341c7dd4b4022d
parent440613f5c35577f9a5bbc087b2e306e37bb8f94e
am 440613f5: am 276565c8: am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.

* commit '440613f5c35577f9a5bbc087b2e306e37bb8f94e':
  Force merge of remaining KLP changes to fix build.