OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21f97de 276565c)
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)
* commit '276565c83c05e24819454dea4008ad5096792e4f':
  Force merge of remaining KLP changes to fix build.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help