tree 478a006ac2b10c777a0addf8d138f2c8d5a4a705
parent bc68555ae54ff9944ec5cf9933bf12583c4381ac
parent ed8cbcca551b8030a11648ad9c4f39a2fe83d525
author Anton Hansson <hansson@google.com> 1575663699 -0800
committer android-build-merger <android-build-merger@google.com> 1575663699 -0800

Merge "Add TEST_MAPPING"
am: ed8cbcca55

Change-Id: Ic1c6a713fc626e4dacb540103528868733af723f