commit | 9ecf3d5904fc7426c71565361e3a1652719a6620 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed May 18 23:02:45 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 18 23:02:45 2016 +0000 |
tree | 0357a322358a7c493121a2a0795a0463f2622a92 | |
parent | 59fc77e3e37f8ef052cb0fa74b9b6456750a6c2c [diff] | |
parent | 5844fdb0eae8fb03ac182e5547fb58eab2dfe92b [diff] |
Merge "Two phases to set the password for disk encryption am: a363036b44 am: ad4dcc2ff6" into nyc-mr1-dev-plus-aosp