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

[automerger skipped] Merge Android R am: f9f607e877 -s ours am: cc38b2532c -s ours

am skip reason: Change-Id Iaf511a01e9a73da3d82251eae2ea49f39f78627d with SHA-1 de477966df is in history

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

Change-Id: Ia70fd5cf48e941d0b02564b509552839df18f189