tree c3a468bc20b801144b050250f1d554b21a59b29e
parent 4089cda0ae73e71adb787e595c747846e30730ee
parent c23074f386ded6cd28b2f8ba2331814b7491c802
author Paul Lawrence <paullawrence@google.com> 1408998515 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1408998516 +0000

Merge "Enable not rebooting during default encryption" into lmp-dev