| commit | ed8aca675d164895fe29457aa7b4dbe27675fa6e | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Fri Mar 12 08:24:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 12 08:24:46 2021 +0000 |
| tree | 6f5d1b35517a2a422e4064df5ed5317dce514519 | |
| parent | 6519ca62174ed8765bda226772b473ace95be15a [diff] | |
| parent | 10af6fb50033f21625838c9f8b5eec27d628b1ef [diff] |
Merge changes from topics "vcn04", "vcn12" am: d219f4807c am: 10af6fb500 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae13465b19d5245782cded0d01ff1b39617c8ac8