tree 87c933573f68b25caa323c683ad589581ae08606
parent beafc29feb2ad222d6c3e981ea307069ab23144e
parent 4d9e9c66fbc82b5f024b6457de591fe75e4a417e
author Yabin Cui <yabinc@google.com> 1465617508 +0000
committer android-build-merger <android-build-merger@google.com> 1465617508 +0000

Merge \"simpleperf: restore perf_harden after simpleperf cts test.\" into nyc-dev
am: 4d9e9c66fb

Change-Id: I39119b7d227b946e294b40bfd6805d886d92fa8b