tree 9ef65c3024ff98b952abb2279bb1d3c7b408ec3e
parent 87b2061c0034d5c922195a1dd3ced058b619f0ae
parent 70e38cd75115659ff9470718531022d28ccccf5b
author Yabin Cui <yabinc@google.com> 1506385614 +0000
committer android-build-merger <android-build-merger@google.com> 1506385614 +0000

Merge "simpleperf: Keep record time and android version in perf.data." am: c34215a771 am: 7c08170f86
am: 70e38cd751

Change-Id: I008c069aa5a1538d90217d186819d629f4eeacf1