[automerger skipped] Merge "Add TEST_MAPPING to schedule auto test" am: 5c262a92de
am: 374153a5cc
am: d4a5fc58c6
-s ours
am skip reason: Change-Id I0847d1dea352d0e3b87b1bb95d5c2600a80a7438 with SHA-1 80d9fcbf1b
is in history
Change-Id: I51eb0db82ff5e0f55e9d3f09c79e0f5aaaef42bc
This commit is contained in: