| commit | 02c7ba73e8733def289535b6d13dc6a504a0443f | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Mar 25 10:22:56 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 10:22:56 2014 -0700 |
| tree | 6a1629d20b82b211d1488d23cf5be4d8f412fd83 | |
| parent | c53ad4cd807e74897ba2d7b799cb8ff6824b34e8 [diff] | |
| parent | 41bb0637ca430808ab40a0300467ea58ae0a05c3 [diff] |
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 '41bb0637ca430808ab40a0300467ea58ae0a05c3': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs