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

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 50568dd112 -s ours am: 18711e0821 -s ours am: 8cac89fd65 -s ours

am skip reason: Change-Id I517fdf14eab1f2be3f84e7b97c6d057f4bbf4bda with SHA-1 500413f16c is in history

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

Change-Id: If8abdbe4fbccbb11868ed9fc9c6bc33e25a0cb25