tree 5df9702566c4b44d10220c4507e61a3c8f76abf7
parent f84fe907141bcdb76425d5ba42913576f018a11c
parent 4ed4526e68b10c9d583541da9dadaf3d29b769cd
author Paul Lawrence <paullawrence@google.com> 1457660575 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457660575 +0000

Merge "Make sure encryption type is set on first boot" into nyc-dev