tree 56a77d6aa22c274dc66d9312ba6079088638c3cb
parent c7e803bcc913e70f4cf8047e16f4f758d080c3fe
parent 4e44272c3d1e2f5c0040acefc3812781aeea1736
author Paul Crowley <paulcrowley@google.com> 1462831250 +0000
committer android-build-merger <android-build-merger@google.com> 1462831250 +0000

Two phases to set the password for disk encryption am: 92c5eeb467
am: 4e44272c3d

* commit '4e44272c3d1e2f5c0040acefc3812781aeea1736':

Change-Id: I0eb0825eee3faffb27736cdaf92b98983369ef47