| commit | 4c60c95d3cebda0b098a5a49fea9f013e95b4a87 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Fri Mar 12 07:50:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 12 07:50:50 2021 +0000 |
| tree | 2906242da8ad3542f9a6d51a7bf11daf0a088c07 | |
| parent | e0e069d4cf1f0c695590b656500680678ced7e05 [diff] | |
| parent | 992f747392233063892bc6234984630361abdfac [diff] |
Merge changes from topics "vcn04", "vcn12" am: 992f747392 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If14f8b2c89483095f22a2b1bc77b0d76cdcb8366