tree 5df9702566c4b44d10220c4507e61a3c8f76abf7
parent d6b13a70fbeaf32660c03f77d11c69124f2f914a
parent 439034b8cc510a95d25c53c8606f88a40ddcbb0b
author Paul Lawrence <paullawrence@google.com> 1457661071 +0000
committer android-build-merger <android-build-merger@google.com> 1457661071 +0000

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

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