| commit | bc73f408f869b0191d036b9e65d9f9e17f3b4a33 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Mar 04 02:10:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 04 02:10:20 2021 +0000 |
| tree | d95b73a8b3bd9fca42f8f2a41074882dc8780d91 | |
| parent | 9c7037df9b4abb9dd70b1e87f82305b8aa6df150 [diff] | |
| parent | e091a0e9ef50f84ab96f855dd3e0d7585ab18863 [diff] |
[automerger skipped] Merge RQ2A.210305.007 am: f5941bf624 -s ours am: 45f71097c3 -s ours am: 34583a2af6 -s ours am: 6cf8d0f6fb -s ours am: e091a0e9ef -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: I64823288d1bd833597c63962da35f71ac80cb22f