| commit | caa3ffacfed47efcaa68681ec1c699bd6c14b802 | [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 | d1e76ee064e615d08c1c76997ac6730a649c63c1 | |
| parent | 890fdb016e5c49190535fcbd37f32a6d758d7aea [diff] | |
| parent | 36b03734efb0607e063c44d02d7b84a971c941ca [diff] |
Merge changes from topics "vcn04", "vcn12" am: 36b03734ef Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628400 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If14f8b2c89483095f22a2b1bc77b0d76cdcb8366