| commit | 6233c1d0bcb8684cbe5561d6fd0680122db9ee34 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Jun 08 00:38:35 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 08 00:38:35 2016 +0000 |
| tree | 2b7f200cfc5e8ce1eff2ee1208d37809bb25f433 | |
| parent | f12e2ee361e4973a858d6b0e31c9b3c7a54045ed [diff] | |
| parent | f8c64089b10acf0e43bb74c176379aa6ce1756e5 [diff] |
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev am: f8c64089b1 Change-Id: Idf719bc91baba5fe18c044183794da4a74251bdd