| commit | 87aac311364a2988ce466db3a053ff757da65709 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Oct 13 04:50:32 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 13 04:50:32 2020 +0000 |
| tree | a9e14e3a9075d4486cd549c95715cf2ed7f951db | |
| parent | 26bb4196b6ce53bae30aa0297b9162b22957417c [diff] | |
| parent | 85574252ace2508c9b7cec02eef55dab976f0de8 [diff] |
[automerger skipped] Merge ab/6749736 in stage. am: 337739ae03 -s ours am: a59b9231e0 -s ours am: 85574252ac -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: Icda71fe16a22c6faebef4937bc68f257bc4afcc3