tree 33a65850f0162f90d208097acea8dd92e49e0c3b
parent 17e016720c3d9fd160cdf5f190349a1667a2bc38
parent 88869b1812bcb8c00dcf1cf6c820c9aed56a45b5
author Winson Chung <winsonc@google.com> 1630464975 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630464975 +0000

[automerger skipped] Merge "Fix some issues with studio build" into sc-qpr1-dev am: e48d6d3f4e -s ours am: 88869b1812 -s ours

am skip reason: Merged-In I4b96bedabcbe9d9c2d2f8ef394781616b83807ec with SHA-1 b0d25d2e93 is already in history

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

Change-Id: I7123521e5f92a4d64fa65d616662d71bcce0f6f4