| commit | 41bb0637ca430808ab40a0300467ea58ae0a05c3 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Mar 25 10:04:07 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 10:04:07 2014 -0700 |
| tree | c127e4b628a99244850990b77fc359c46e324ebe | |
| parent | 072e1da26e80adb4009d063428c2ef8fb65c3d6c [diff] | |
| parent | 76e85eec845ff3688e6fd5b7bafbb5934530df4b [diff] |
am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev * commit '76e85eec845ff3688e6fd5b7bafbb5934530df4b': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs