tree 826caae363adff7f20ceebab8c1be3949d1dfaf4
parent 0d6f57a90f158a478bb101ff3b90dc2548a225f6
parent c6ebcaaad7512da4b2ef6f438fd78c92c28774ec
author Tao Bao <tbao@google.com> 1556152586 -0700
committer android-build-merger <android-build-merger@google.com> 1556152586 -0700

Merge "Add TEST_MAPPING."
am: c6ebcaaad7

Change-Id: Ib9d892cf4657a6b4cce9c15c6f25f5a89b4dbdef