tree 8b997911fc9265d59ac5f8c38d6cc6aa12f2ec2c
parent 6afec2ab782db938e52291646411ad88f92542b8
parent 9551a91b5ba6ff99b917e13746c8ea1a06eb118c
author Jordan Liu <jminjie@google.com> 1575503102 -0800
committer android-build-merger <android-build-merger@google.com> 1575503102 -0800

Merge "Add TEST_MAPPING"
am: 9551a91b5b

Change-Id: I046f6812587b9366ac9d3a684e45b2f2ef9d87e0