commit 02fb18082ac7f00d2934a38df25d10a852f68a0f
author android-build-team Robot <android-build-team-robot@google.com> Tue Dec 15 22:11:50 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 15 22:11:50 2020 +0000
tree 47dfe5ce62ad962439f2cd994e02f11ee5492639
parent cc0826af009df49f5f6f3e1d7a437a30edf91d09
parent 9f1c0e6c293d0dcf929cbdb879a35397a8c879f0

Merge cherrypicks of [13231586, 13231437, 13231588, 13230397, 13230399, 13231350, 13231351, 13231354, 13231356, 13231439, 13231441, 13231358, 13231443, 13231360, 13231030, 13231457, 13230243, 13231032, 13231725, 13230838, 13231034, 13230840, 13230842, 13231361, 13231363, 13231745, 13231458, 13231747, 13231749, 13231751, 13229580, 13229582, 13231589, 13231591, 13231764, 13230400, 13230402, 13231784, 13231786, 13231788, 13231790] into rvc-qpr1-release am: 9f1c0e6c29

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13231814

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41ab221802cb03f127c896b4495ac31c4a1415be