commit | 86f9a93e20bf33b9f5152592f4781bd253be8643 | [log] [tgz] |
---|---|---|
author | Craig Mautner <cmautner@google.com> | Tue Mar 25 16:43:40 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 25 16:43:41 2014 +0000 |
tree | 6cdbff5076eb417f35128bf45f3bd2d650b11030 | |
parent | 81fbdade8db4117157ea48602be121e6cf5597dd [diff] | |
parent | 0392442de8295caf1b9ce9dc5fb19f9798b54972 [diff] |
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev