| commit | f4e696694ca41fb967ab03604df4a379017d2c3f | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Thu Mar 04 00:36:23 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Thu Mar 04 00:36:23 2021 +0000 |
| tree | a05511cdacef8b808ba7453fefaee879b4062f71 | |
| parent | 4a56c2dd5d8abdf814b20fd108c8575315ed40ae [diff] | |
| parent | 6cf8d0f6fbe2322fb6f41a306e64b50347b58e6d [diff] |
[automerger skipped] Merge RQ2A.210305.007 am: f5941bf624 -s ours am: 45f71097c3 -s ours am: 34583a2af6 -s ours am: 6cf8d0f6fb -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: I8e1358f5ca15b6a75436c9b4e2441be5a3ff52b4