| commit | 26bceb2583bb81cf8470dd8e0bfd05f02293a896 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Wed Feb 10 19:37:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 10 19:37:26 2021 +0000 |
| tree | 23a70cf6cc2c8a02039fdb3edfb1e6adab6bc29f | |
| parent | 39390a15619c7150598c7afafad3d967e2581865 [diff] | |
| parent | 32420c33972877aad89a60b1fa37f19401c5763a [diff] |
Merge changes from topic "ike-bcp" am: 073c6fa957 am: 32420c3397 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573901 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2422b977fafa2382960cd769bab1380ca5b138e5