tree 5490c76151d020ce91bd6a232bb6712c37a5421d
parent 7887bb4f57508c65b3e362a08268e44bda740df1
parent 34890bb2f76e57bef95c6be7a1a49aaefd57ea92
author Orion Hodson <oth@google.com> 1526991356 -0700
committer android-build-merger <android-build-merger@google.com> 1526991356 -0700

Merge "ART: Fix for pkill on device in run-jdwp-tests.sh" am: 1d00c5313b
am: 34890bb2f7

Change-Id: Ia83aeee6f917370fc6cb7d894687b786849a810b