| commit | 550b44d1884c5f65187dbc8bf8d4e6090f302a7b | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Mar 25 10:42:38 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 10:42:38 2014 -0700 |
| tree | 76cf5eaef828bff67f76eb07a2d5bd57f6bf82db | |
| parent | 5035faba9a28f988291c4ff3d3cbf64d828f3f5a [diff] | |
| parent | f4644189f665f221e8033587811e58f12e2ccc86 [diff] |
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 'f4644189f665f221e8033587811e58f12e2ccc86': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs