OSDN Git Service

Merge "Make Instrumentation more robust to other inputs" into pi-dev
authorJason Monk <jmonk@google.com>
Wed, 18 Apr 2018 23:54:05 +0000 (16:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Apr 2018 23:54:05 +0000 (16:54 -0700)
am: 3071522227

Change-Id: Ifc3e5c1959a3b25025f396fbfc91363580b239ad


Trivial merge