| commit | e6ad7bf05263941ea89b8dda7cded6f9d434a6da | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Wed Nov 05 15:57:08 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 05 15:57:09 2014 +0000 |
| tree | aa0e5509ad727e30c35187697d22b41ee0790db1 | |
| parent | 7db037a989ea9c106ea404681cfe22a1fd2a2973 [diff] | |
| parent | 01fbd9fd3ca70f7181c2421cc5f080136384737e [diff] |
Merge "Don't show a pattern-specific prompt at encryption time." into lmp-mr1-dev