tree 88fc8661237a3feef49be553c71f1bc9d65317d7
parent f7118952631ada8f4cfcba0e3f6efb4d1f62bb6d
parent de477966dfcc3e10b56f9a5bd97804de843977b2
author Xin Li <delphij@google.com> 1598992635 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992635 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: de477966df -s ours

am skip reason: Change-Id Ia4252557017a3f7dc4e40a4e006994becdcfc77f with SHA-1 1508d88344 is in history

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

Change-Id: I9b09b74abc0d4840657496a120b295712ebc4f77