tree 9e1a3d30b39c2c7ab4f6ff97be6aec9c808d4b89
parent 8d2a97e8baa7ff3e36de7dc31f1066c5318d805c
parent ac62b81c12cde3225295faf63ffe4eb04babf492
author Xin Li <delphij@google.com> 1629229595 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629229595 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 9be0f7fe4f -s ours am: ac62b81c12 -s ours

am skip reason: Merged-In Ia4baa55e8a85faf24c7fcaafb99b5c7799dc233e with SHA-1 8d2a97e8ba is already in history

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

Change-Id: Ib3d83bd4900a7f668ffe2f312f6d0127cb9fcd58