tree 7e80136a8dea2dd12b689fc159d22c2084e61d5e
parent 682fc257cc779295effc7249ec9df41f3e56c037
parent b7f21b62d358e8faae8727ceb9e41076c3b26077
author Joel Galenson <jgalenson@google.com> 1617844778 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617844778 +0000

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

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

Change-Id: Iff5ca2c65341ff305a1f4f6b265931fd7fe1caa2