tree bfdd9bf770594dc7872df00283c5614677df17e3
parent 9088b88c7a5117d2def860ae4369f72d86f2be3a
parent e1172ef700cc0070068f442d45e0cb551b3a6aa9
author Yabin Cui <yabinc@google.com> 1483731678 +0000
committer android-build-merger <android-build-merger@google.com> 1483731678 +0000

Merge "simpleperf: add scripts to sdk build." am: a29ece7f55
am: e1172ef700

Change-Id: I67fb33497f72bdf3087e2a9f7bd52840f50468b1