tree 4825c753a1d8c8c27b8c6a4595a5cfbae221a4c7
parent 3fe89fa08d12da80774e44e9e2aa0ecf5fdf7949
parent d4d6e0c95d5b7152ea78392970fc48d7b93d1ac3
author Yabin Cui <yabinc@google.com> 1490141622 +0000
committer android-build-merger <android-build-merger@google.com> 1490141622 +0000

Merge "simpleperf: add new scripts in sdk artifacts." am: 955ffc9f09
am: d4d6e0c95d

Change-Id: Ic8f2ed68e863d56a447892657b28687b347c35c2