| commit | 85574252ace2508c9b7cec02eef55dab976f0de8 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Oct 13 04:22:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 13 04:22:41 2020 +0000 |
| tree | 88fc8661237a3feef49be553c71f1bc9d65317d7 | |
| parent | 9811d367c8c2bbd13dfee1d66d5b02654f9c1f52 [diff] | |
| parent | a59b9231e0f1de68cba4e8ef445aa382c2ca6e35 [diff] |
[automerger skipped] Merge ab/6749736 in stage. am: 337739ae03 -s ours am: a59b9231e0 -s ours am skip reason: Change-Id I70ca5c19252038eba1852f60ddcd6172bee9c65f with SHA-1 7e848aae3c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/layoutlib/+/12804053 Change-Id: I94c673ca4c8675cd02b4b870762c7c22c73f7bd4