OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 707692c 74ee938)
am 74ee938d: resolved conflicts for merge of ffb22827 to master
authorCraig Mautner <cmautner@google.com>
Tue, 1 Apr 2014 22:27:43 +0000 (22:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Apr 2014 22:27:43 +0000 (22:27 +0000)
* commit '74ee938dcc5e1ab0309dd87278e26f604c756b26':
  Fix FLAG_DISMISS_KEYGUARD not working


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