| commit | 95d6e32bc3c5382740a6bb418f77cf7147d833f7 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Mar 25 09:48:27 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 09:48:27 2014 -0700 |
| tree | b9a99515a6fc86be511a090f107ed1125172073e | |
| parent | 665b07579aa2a74bb5425d543892da40d78b7ef8 [diff] | |
| parent | 86f9a93e20bf33b9f5152592f4781bd253be8643 [diff] |
am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev * commit '86f9a93e20bf33b9f5152592f4781bd253be8643': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs