OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b377688 1066fc6)
am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev
authorCraig Mautner <cmautner@google.com>
Fri, 14 Mar 2014 02:40:49 +0000 (19:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 02:40:49 +0000 (19:40 -0700)
* commit '1066fc61a371443e9423f890f6f7615f2d1e4c6c':
  Show the keyguard if unsecure window on top


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