commit | cc38b2532ca3da9a852f6005eac7d89283562f07 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 00:40:28 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:40:28 2020 +0000 |
tree | 245e84a93d19adff3ae726b6f9e01c9d03974ec6 | |
parent | de477966dfcc3e10b56f9a5bd97804de843977b2 [diff] | |
parent | f9f607e877cd55a6a53bebb8620b213563712a03 [diff] |
[automerger skipped] Merge Android R am: f9f607e877 -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: Ie336b5e1cd223a52280c243384788607d78f7926