| commit | d09550687360544f0659e37f393ba2f5b04b55a4 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Mar 25 20:11:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 20:11:08 2014 +0000 |
| tree | 1ead2551061659bbba2a905ab29e06a4ba986973 | |
| parent | dc18ce783fa10466d15ec74be38d38555c4750c6 [diff] | |
| parent | 74e19f572a598ce907661ed2f5127319f8d7c635 [diff] |
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 '74e19f572a598ce907661ed2f5127319f8d7c635': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs