tree 46486d665dd16510e4fff9b4c42b1713bdf9244a
parent 2c75df9b8344609fbb1708d0ec74309ab184fb87
parent 59b4bdf2401d0d549d6cdcfb4e198e3cb31702d1
author Xin Li <delphij@google.com> 1599859674 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859674 +0000

[automerger skipped] Merge Android R am: fab6cd93c1 -s ours am: 2120829015 -s ours am: 23730ad163 -s ours am: ed8a777667 -s ours am: 59b4bdf240 -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: Id29c58446fe0a3ed8ef49d1cdcd9d1a3be8aab0f