tree 74edff3799aa27849ea78d973dd99656ae320d0a
parent 1f17f8dd1573e19085028b9c935c546f30c84593
parent 4507b9d0fb6515b6506c65b946c54ec062cb7ca8
author Tao Bao <tbao@google.com> 1556158470 -0700
committer android-build-merger <android-build-merger@google.com> 1556158470 -0700

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

Change-Id: I67b01596604d3e17d904fee48e7e894961b10f41