tree 92c123c7330206529b5e2fad9faabca29cfd633e
parent 26edd04c6b6dfb8e2923ae46c5f9ea8b2eb68040
parent 2f596464fdf0ef89cd2231eb0f6546d9f8516e65
author Yabin Cui <yabinc@google.com> 1483498121 +0000
committer android-build-merger <android-build-merger@google.com> 1483498121 +0000

Merge "Revert "simpleperf: add binaries in sdk build."" am: b4cdbd535c
am: 2f596464fd

Change-Id: I6969919508873bc4065849a70a9436329db603bb