tree f57c20fea158164b97b67aa962cd6dd2e6faef91
parent 16acd811e10bd13e403fe0bc877c8b0b779547e9
parent 00786076cd6a3a32a42f95b4813ea807321b3fda
author Paul Lawrence <paullawrence@google.com> 1409028819 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409028819 +0000

am 00786076: Merge "Don\'t reboot after default encrypting" into lmp-dev

* commit '00786076cd6a3a32a42f95b4813ea807321b3fda':
  Don't reboot after default encrypting