tree bfb962a5ec7ac6e836d0677a65fb2b394d7505e4
parent f8ad474935c93ae3730e3a1b7f385029499e2de4
parent 6c35ea901c364f14198009b00b9e838842516911
author Alan Stokes <alanstokes@google.com> 1538422550 -0700
committer android-build-merger <android-build-merger@google.com> 1538422550 -0700

Merge "Add TEST_MAPPING for DexManager etc."
am: 6c35ea901c

Change-Id: Id73537c01113cf7ae574b141b0b7e7e831fc33cd