OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bda3065 cbc771f)
am 31632435: Merge changes Ia6fe9724,I682b9acb into lmp-dev
authorCraig Mautner <cmautner@google.com>
Fri, 12 Sep 2014 05:07:11 +0000 (05:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Sep 2014 05:07:11 +0000 (05:07 +0000)
* commit '31632435a5d994dc6e344186de31f19fdb08ca4e':
  Show all windows from activity that hides keyguard
  Make sure FLAG_DISMISS_KEYGUARD brings up bouncer


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