| commit | c89283c5863855fadd8853e524e36e19aaaf142a | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Mar 25 20:15:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 20:15:49 2014 +0000 |
| tree | 8b0187e5226d825283ac464a665879322cbfb7e2 | |
| parent | 1cf8117aa22c5ef16c5513fd1c6d428233df4833 [diff] | |
| parent | d09550687360544f0659e37f393ba2f5b04b55a4 [diff] |
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 'd09550687360544f0659e37f393ba2f5b04b55a4': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs