tree 53b5a0a19f459024b3a9edfb7120e6a8bb49a42b
parent 24eb4d1cdd478ba1c78dcc27bdf06f1676c18af5
parent d8cecf4df96c1c572f1db64a170e44c9b915136e
author Tao Bao <tbao@google.com> 1556152768 -0700
committer android-build-merger <android-build-merger@google.com> 1556152768 -0700

Merge "Add TEST_MAPPING." am: c6ebcaaad7
am: d8cecf4df9

Change-Id: Ia7377f8c4baebc4175855465befca024d87243bf