diff options
| author | Jim Miller <jaggies@google.com> | 2016-06-08 00:50:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 00:50:23 +0000 |
| commit | 545777ba01910c14abbda49433a04ee9914fc069 (patch) | |
| tree | 978a3cadbbdc0788903966a05a59f9447b9cf248 /docs/html/sdk/api_diff/20 | |
| parent | 6164959544702934b34f08f1cad3db9bf3691524 (diff) | |
| parent | a8705f62ead383c458d3997e936dfa8c44b3b8e9 (diff) | |
Merge \"Merge \\\"Move legacy full disk encryption code to Settings.\\\" into nyc-dev am: 4401e24add am: 2cf5b73c0a\" into nyc-mr1-dev-plus-aosp
am: a8705f62ea
Change-Id: I538cd4562df5bba64337b66bb63b48b6b5425cc8
Diffstat (limited to 'docs/html/sdk/api_diff/20')
0 files changed, 0 insertions, 0 deletions