| commit | cd9d960d236b5008aad4c20a9946190eb89fa4fb | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Thu Feb 11 22:35:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 11 22:35:37 2021 +0000 |
| tree | e44d7179d51ed773e1f6a4eb1bba92c08b9d3c0f | |
| parent | 0072df0d0391e6a998053ebc848c730bc6670ab4 [diff] | |
| parent | 60edeec07e2624d5b6b0747a322b953e3814e2c4 [diff] |
Merge "Delay loadEscrowData from locksettings" am: 60edeec07e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566555 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ef3ce66e9771bc8864c84c91330c2947a74c673