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

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

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

Change-Id: I15d9dd15b920f403c1a6bb4b073fd9cf4abdd111