OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ee72b6 95d6e32)
am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs...
authorCraig Mautner <cmautner@google.com>
Tue, 25 Mar 2014 16:52:28 +0000 (09:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 16:52:28 +0000 (09:52 -0700)
* commit '95d6e32bc3c5382740a6bb418f77cf7147d833f7':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs


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