OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bc9971 7bd0b65)
am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
authorCraig Mautner <cmautner@google.com>
Tue, 1 Apr 2014 19:24:23 +0000 (19:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Apr 2014 19:24:23 +0000 (19:24 +0000)
* commit '7bd0b65233d0ef34114ecb93d734dfe4351f470d':
  Fix FLAG_DISMISS_KEYGUARD not working


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