tree 650bbe6b2a00e9f82ae922ef7a00fd01a05c70e5
parent bc79a1c4685363d73799b3c51afa4cb00967e70a
parent fbf163294aedf54ccb6818a5c1b78ef390013b7a
author Dan Shi <dshi@google.com> 1570304250 -0700
committer android-build-merger <android-build-merger@google.com> 1570304250 -0700

Merge "Sync TEST_MAPPING file from master branch" am: 38b83f0558
am: fbf163294a

Change-Id: I23b25f09c35326a0608e6d30eaa3e7e65f1b5582