| commit | 4cf6286c3ccfe63bf73e6a1fb33e67d1becd16be | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Mar 25 10:29:48 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 10:29:48 2014 -0700 |
| tree | 690651a217d8fb28ac9758a93f5ee989a06b666b | |
| parent | 759445c5bdb2eb54af9e974f604226596976e078 [diff] | |
| parent | 02c7ba73e8733def289535b6d13dc6a504a0443f [diff] |
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 '02c7ba73e8733def289535b6d13dc6a504a0443f': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs