OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79ff1ea 462ec10)
am 462ec104: am 30a03425: (-s ours) am 0063e0bc: Merge "Disable Keyguard affordances...
authorAdrian Roos <roosa@google.com>
Thu, 27 Aug 2015 18:27:34 +0000 (18:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:27:34 +0000 (18:27 +0000)
* commit '462ec1042f4755db6cb40d32b27a513912c1f56b':


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