commit | 84cb9edfcc91971622d1f91abe7c5435d38458bb | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Oct 20 21:08:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 20 21:08:05 2020 +0000 |
tree | c426f68837d3719e11ab270f2fd936f0e1c0df3a | |
parent | b620d6d8a9a4ed2362fd8c0ba97d423d48925111 [diff] | |
parent | 995ee91dbaece9fe3323d80d82438dab2802cbc1 [diff] |
[automerger skipped] Merge redfin/bramble support. am: c6530fa75b -s ours am: d149263995 -s ours am: aff914c5d5 -s ours am: 995ee91dba -s ours am skip reason: Change-Id I075961a717a9a604877dfbece5251a45a2ca8481 with SHA-1 337739ae03 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/1466388 Change-Id: Ib5b20f1bc3853a547f923330a3bf1034b09945e1