OSDN Git Service

Merge "simpleperf: Add UnixSocket." am: b1bb2ea2fd
authorYabin Cui <yabinc@google.com>
Thu, 27 Oct 2016 16:40:20 +0000 (16:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 16:40:20 +0000 (16:40 +0000)
am: 1d47e5ac0e

Change-Id: I77b30fee54aad48c8af518ff586b4f381fb0e89a


Trivial merge