commit | 59b4bdf2401d0d549d6cdcfb4e198e3cb31702d1 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Sep 11 03:59:25 2020 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 03:59:25 2020 +0000 |
tree | 46486d665dd16510e4fff9b4c42b1713bdf9244a | |
parent | b74b21bbd87fa6fdc1d701f8145a7b63ba0556ff [diff] | |
parent | ed8a77766785711571d0c0f8ae240988836aaaf0 [diff] |
[automerger skipped] Merge Android R am: fab6cd93c1 -s ours am: 2120829015 -s ours am: 23730ad163 -s ours am: ed8a777667 -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: I8e603414a385ddb54be8bcf75049509baebc5326