| commit | 76e85eec845ff3688e6fd5b7bafbb5934530df4b | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Mar 25 09:58:17 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 09:58:17 2014 -0700 |
| tree | 8590a62f726f0aef8806e429efae1a1298e1d867 | |
| parent | b17cf207372268d91177de7efa692b2483785991 [diff] | |
| parent | 3bc9971d707839f2d26e601082d654242295002d [diff] |
am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev * commit '3bc9971d707839f2d26e601082d654242295002d': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs