OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1adb894 c89283c)
am c89283c5: am d0955068: am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am...
authorCraig Mautner <cmautner@google.com>
Tue, 25 Mar 2014 20:21:30 +0000 (20:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 20:21:30 +0000 (20:21 +0000)
* commit 'c89283c5863855fadd8853e524e36e19aaaf142a':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs


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