OSDN Git Service

Merge \\"simpleperf: fix mac build.\\" am: 898b3f48e2
authorYabin Cui <yabinc@google.com>
Tue, 14 Jun 2016 01:52:57 +0000 (01:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Jun 2016 01:52:57 +0000 (01:52 +0000)
am: ab0531d484

Change-Id: Iae639a12f2629774731b4ab7d85eab1b6755efd7


Trivial merge