tree 46486d665dd16510e4fff9b4c42b1713bdf9244a
parent 8cac89fd65ed3ab66aaeb186800e83150f8385f9
parent 23730ad1638ffe451c672e5d7cdac86c70f578b9
author Xin Li <delphij@google.com> 1599795234 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795234 +0000

[automerger skipped] Merge Android R am: fab6cd93c1 -s ours am: 2120829015 -s ours am: 23730ad163 -s ours

am skip reason: Change-Id I5d7809cf7ab2c26f22ad34434bfd997baed6e327 with SHA-1 50568dd112 is in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/bundletool/+/1421785

Change-Id: I90e2563d913fee9eb98fdd1a5baa72355469374f