| commit | a95e10fe3187d1dd3fbbd01d6653d7d9c2f9fc4d | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Aug 26 04:53:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 26 04:53:43 2014 +0000 |
| tree | 8f9bfe2bc463b7516e8a4d9e33e3983ba3f7909f | |
| parent | 64362fd2d853cfcc971759afee68e2ec66f5bb0e [diff] | |
| parent | a005e7795e3dfb7cc0bd2bc65208d2490bfc89d8 [diff] |
am a005e779: Merge "Enable not rebooting during default encryption" into lmp-dev * commit 'a005e7795e3dfb7cc0bd2bc65208d2490bfc89d8': Enable not rebooting during default encryption