tree 0ba7dc336c1d98a2415c20ae380b16d643e60a8a
parent f322c46ffada5733e0b59114b1624a3d2bd43478
parent 4c0bf9ff7bff3ad9bf6421d30e8892b2730b91bf
author Joel Galenson <jgalenson@google.com> 1617841881 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617841881 +0000

Merge "Add a cargo2android flag to disable generating TEST_MAPPING." am: 4d82acfeee am: 4c0bf9ff7b

Original change: https://android-review.googlesource.com/c/platform/development/+/1667071

Change-Id: I088da12a08116d792814cce74aeb9c4e6f7cb49e