tree e8e38b25f53cc32179db13198293cffce182330c
parent cb1f39ae9c00e7b2d98de491d76a3655935cd154
parent 056602896526bb105c72d68ea152fdb1dd5f1bcd
author Yabin Cui <yabinc@google.com> 1513890487 +0000
committer android-build-merger <android-build-merger@google.com> 1513890487 +0000

Merge "simpleperf: Add needed testdata in artifacts." am: 7a7b47c665 am: 9a5e27ee52
am: 0566028965

Change-Id: I5bdf68343fbefe2aca35aad4515501e3af84b64a