OSDN Git Service

am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am...
authorCraig Mautner <cmautner@google.com>
Tue, 25 Mar 2014 17:58:54 +0000 (17:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 17:58:54 +0000 (17:58 +0000)
commit74e19f572a598ce907661ed2f5127319f8d7c635
treea1a7f7a7f62c3152434d67220b41e1975e4a2821
parent78373edb8d5838276c73a418b07f735ad20286dc
parent6f955df8e632aabeef312d488b7ebbad25d8a2d8
am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

* commit '6f955df8e632aabeef312d488b7ebbad25d8a2d8':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs