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