tree b051c08941a34964a3edec8caf88b329c4333c18
parent 9155d4f8d10d47ed4bf309929c8998e15c38b9a2
parent f2679e9bb8aabf4963425941bdbfd0683e5ff843
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581369871 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581369871 +0000

Merge "Add TEST_MAPPING for Compatibility api" am: f2679e9bb8

Change-Id: I0f9799c433b86a52fdedfab541f9999cef967dbd