diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-20 12:25:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 12:25:30 +0000 |
| commit | 657ec5c846d4db7cc1c20d784d67acacadc3b142 (patch) | |
| tree | dba8947bffd107d7297878508f1b035bcb6be345 /docs/html/sdk/api_diff | |
| parent | 9801436e7f0a04b60839e4f4888de51ed1ba4fc8 (diff) | |
| parent | 55cd97f94c7e821e42f43d61583dd66d17f2d95f (diff) | |
Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." am: bfc1f6b382 am: 7fa15840a8 am: 55cd97f94c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578423
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia73cdbf546322a3579e384cc61e2076483d068df
Diffstat (limited to 'docs/html/sdk/api_diff')
0 files changed, 0 insertions, 0 deletions