OSDN Git Service

Merge \\"simpleperf: don\\'t warn if child process was killed by simpleperf.\\" am...
authorYabin Cui <yabinc@google.com>
Thu, 7 Jul 2016 23:17:45 +0000 (23:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jul 2016 23:17:45 +0000 (23:17 +0000)
am: b609462246

Change-Id: Ia55dd5c9adfcd431f303b0fdc9b22b134e240e28


Trivial merge