tree 3478ed3e8ba6c1ae95fb634241ee3034ae7252b5
parent 18c5ac8e0d3c1ba33ed6aad65551790796a967f8
parent 848a32afa9731b53bab74f24f357dff2a6b3b477
author Colin Cross <ccross@android.com> 1539936645 -0700
committer android-build-merger <android-build-merger@google.com> 1539936645 -0700

Merge "Fix instrumentation_for to refer to name of module" am: 24ead5672b am: 3463839772
am: 848a32afa9

Change-Id: I7507b2d5b974c17a388360a52b57aa7ee41de919