| commit | 0ca47e2c5506d286469f29c25e5d45a45623e20f | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Fri Mar 11 21:49:16 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 11 21:49:16 2016 +0000 |
| tree | 35f4f10eaaf868a8154b912f3ddb7bfa662ec15c | |
| parent | 856e72d3d507d3f644a3fd6410b18d4b68b15953 [diff] | |
| parent | 23c2acfd4c01b270c998a4a497c658cc3d842473 [diff] |
Merge "Don't show secure startup options and strings when file encrypted" into nyc-dev