tree 3478ed3e8ba6c1ae95fb634241ee3034ae7252b5
parent 93cf8bb309dde92a97552d39287d7cfc1af0d0cf
parent 3463839772581875057a951f9b54837a825b8c40
author Colin Cross <ccross@android.com> 1539936342 -0700
committer android-build-merger <android-build-merger@google.com> 1539936342 -0700

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

Change-Id: I52fca337bd9cf4e0e0cd1d0d52e3dfb0134c6a59