| commit | c241564e16ac0c71c8694ff16df99211cf50e5f0 | [log] [tgz] |
|---|---|---|
| author | Cody Kesting <ckesting@google.com> | Fri Feb 05 17:50:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 05 17:50:46 2021 +0000 |
| tree | 7ffac9bbf5eb9aacc86aa2695b4240093c1df2fe | |
| parent | ab3209763e05b09e76d346618f9a0c3066434c63 [diff] | |
| parent | a6d1cd266c55d897e527be9d06001279ed050bcc [diff] |
Merge changes I128a894c,I3336c150 am: 9a5b717514 am: a6d1cd266c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574505 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibf5f11c967f0c8515704d2a3d316254a66b8363b