| commit | ad5b54aa6480b384f90ecb0acd9e2c6f30fd45c1 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Aug 26 10:07:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 26 10:07:27 2014 +0000 |
| tree | 8342e12c7da2fbb2daced0c19e0a457ba3fc5724 | |
| parent | ec865a6c488cd4250e6599fc62461f8fd2a34776 [diff] | |
| parent | a95e10fe3187d1dd3fbbd01d6653d7d9c2f9fc4d [diff] |
am a95e10fe: am a005e779: Merge "Enable not rebooting during default encryption" into lmp-dev * commit 'a95e10fe3187d1dd3fbbd01d6653d7d9c2f9fc4d': Enable not rebooting during default encryption