| commit | 59adea1eedb69c8877c4f75c76c2a1afa78214dd | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Thu Feb 11 23:15:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 11 23:15:12 2021 +0000 |
| tree | baf0bd9fa84d1fd4b4eafc2900cbb5e947ee55b4 | |
| parent | bfde98c357623e417eaa667a3595665d56039013 [diff] | |
| parent | bc71ae14893ee2452b0508cf3cb4ccebeff705f0 [diff] |
Merge "Delay loadEscrowData from locksettings" am: 60edeec07e am: cd9d960d23 am: bc71ae1489 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566555 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I510b4d6da055157796b75d46981b103f63e7f344