| commit | 8d67f49cf3d2cd688674a2d293aaa615efb11139 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Wed Feb 10 19:54:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 10 19:54:19 2021 +0000 |
| tree | ebc3e1876e8495af4f18915da5fdb8bc863d50df | |
| parent | 7709895a458751a407a690f47041edf4c69e7782 [diff] | |
| parent | 26bceb2583bb81cf8470dd8e0bfd05f02293a896 [diff] |
[automerger skipped] Merge changes from topic "ike-bcp" am: 073c6fa957 am: 32420c3397 am: 26bceb2583 -s ours am skip reason: Change-Id I05c8c46f102b01945724077830dc9871ab407c1d with SHA-1 7a2d1c5486 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573901 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2d8ce667bf18fd0fdfb231a6e101f1b8206d338a