OSDN Git Service

Merge "simpleperf: fix mac build." am: 9e0f649ea9
authorYabin Cui <yabinc@google.com>
Thu, 25 Feb 2016 20:40:10 +0000 (20:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Feb 2016 20:40:10 +0000 (20:40 +0000)
commitc608df15e0bdb6aafe1f4811cd9823cbbe76261c
treea4d7ec8e1a0283fb57bd040a057e7945b0ce8e85
parentf75c5f6904412ffa8582383696fe38a08b7b969d
parent99adeea02aee4f2887f8dfb325ce919d404aad2f
Merge "simpleperf: fix mac build." am: 9e0f649ea9
am: 99adeea02a

* commit '99adeea02aee4f2887f8dfb325ce919d404aad2f':
  simpleperf: fix mac build.