OSDN Git Service

Merge \"simpleperf: restore perf_harden after simpleperf cts test.\" into nyc-dev
authorYabin Cui <yabinc@google.com>
Sat, 11 Jun 2016 03:58:28 +0000 (03:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 11 Jun 2016 03:58:28 +0000 (03:58 +0000)
am: 4d9e9c66fb

Change-Id: I39119b7d227b946e294b40bfd6805d886d92fa8b


Trivial merge