diff options
| author | Paul Crowley <paulcrowley@google.com> | 2016-05-18 22:54:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-18 22:54:43 +0000 |
| commit | 02826bb36b023ba80b88ada743ac32b534a2c380 (patch) | |
| tree | 9241e2ba52b23ab870eccda03f539f0acb68e134 /docs/html/sdk/api_diff/20/changes | |
| parent | 643a9a79cfa2f65cf88c9fbb1ef46f335d943aea (diff) | |
| parent | 2a1076339ecb7ba9b7c8829bb3c3285df29a67e3 (diff) | |
Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb
am: 2a1076339e
* commit '2a1076339ecb7ba9b7c8829bb3c3285df29a67e3':
Two phases to set the password for disk encryption
Change-Id: I884dae66b133d8b9312a7793d415964e13ed8105
Diffstat (limited to 'docs/html/sdk/api_diff/20/changes')
0 files changed, 0 insertions, 0 deletions