| commit | 74e19f572a598ce907661ed2f5127319f8d7c635 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Mar 25 17:58:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 17:58:54 2014 +0000 |
| tree | a1a7f7a7f62c3152434d67220b41e1975e4a2821 | |
| parent | 78373edb8d5838276c73a418b07f735ad20286dc [diff] | |
| parent | 6f955df8e632aabeef312d488b7ebbad25d8a2d8 [diff] |
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