| commit | 1ae6078b8467b6c6193e7de9fa5a85c7ff888b7c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:11 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:11 2020 +0000 |
| tree | 88fc8661237a3feef49be553c71f1bc9d65317d7 | |
| parent | 6ba54fcc1e324c0941a8b268c65861444d03c233 [diff] | |
| parent | dfea89683e65b534f7ddb9354e375abee5d403b2 [diff] |
[automerger skipped] Merge Android R am: f9f607e877 -s ours am: cc38b2532c -s ours am: b5941170b8 -s ours am: dfea89683e -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: Id83ed1f2bf11221bd14b6246073f52de8e5f21de