commit | 1931a317723413e600f1667b02cf34b4855e5921 | [log] [tgz] |
---|---|---|
author | Junyu Lai <junyulai@google.com> | Fri Mar 12 09:07:00 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 12 09:07:00 2021 +0000 |
tree | 1c53447bca752a487b1cd1d571eb086ae21b4b05 | |
parent | 99cac418190b0237c670ae61355f7888a271df23 [diff] | |
parent | ed8aca675d164895fe29457aa7b4dbe27675fa6e [diff] |
Merge changes from topics "vcn04", "vcn12" am: d219f4807c am: 10af6fb500 am: ed8aca675d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3db655c53a855fe418ba5c6fd8230622805966d5