tree 8258874c7a32f15ca7d883b58afd04cc2ac1c2ff
parent 6de04b723d0e5309355e51c7a80fe13c553aa5ff
parent 2ac0a5d4720aed8211988337ff96156d8722a917
author Dan Shi <dshi@google.com> 1513026151 +0000
committer android-build-merger <android-build-merger@google.com> 1513026151 +0000

Merge "Create an artifact to include TEST_MAPPING files in source code" am: 9874428159 am: 3981526a34
am: 2ac0a5d472

Change-Id: Ic0e5a5482f239be073bd0f34579fd5c9ed032cbc