OSDN Git Service

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


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