OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6abb7a6 48ce6d2)
am 48ce6d27: (-s ours) am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
authorBart Sears <bsears@google.com>
Thu, 27 Aug 2015 10:22:02 +0000 (10:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:22:02 +0000 (10:22 +0000)
* commit '48ce6d27015fa40291ed1aa4fcf414c3cb6fa818':


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