tree 912654030a0007a6059eba621ec9d0abc579e854
parent 53b9484734cdb3b8bfb24b59cf51ef8eb98be9fc
parent dba928fabdd25b2834d6178c99a1c9557f89fa7c
author Paul Lawrence <paullawrence@google.com> 1457661223 +0000
committer android-build-merger <android-build-merger@google.com> 1457661223 +0000

Merge "Make sure encryption type is set on first boot" into nyc-dev am: 439034b8cc
am: dba928fabd

* commit 'dba928fabdd25b2834d6178c99a1c9557f89fa7c':
  Make sure encryption type is set on first boot