tree eb5ca2b6219e6d8064855355eeb1570fd7390bbc
parent 3dd28a168d751281f91ca272d83f00f3e92db70a
parent 45f71097c30f62f3312e4dad2d11e5c60e0caac4
author Xin Li <delphij@google.com> 1614814622 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614814622 +0000

[automerger skipped] Merge RQ2A.210305.007 am: f5941bf624 -s ours am: 45f71097c3 -s ours

am skip reason: Change-Id I9cd58a1c9be7347a13541e53b5876d965a11f35b with SHA-1 78aa4dafb7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2fd52bed52a2e87df169f0412dd105a63adefff