OSDN Git Service

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)
commitf07788b997e31578da202525ac72d4eec6fe4176
treec2238e9d034b35d424ddf6faa820cc5301b6f74c
parent1adb8947dae240a11d96450971b3b84d745339c3
parentc89283c5863855fadd8853e524e36e19aaaf142a
am c89283c5: am d0955068: am 74e19f57: 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 'c89283c5863855fadd8853e524e36e19aaaf142a':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs