OSDN Git Service

Merge "simpleperf: use file records in protobuf output." am: 2a309ae76b am: 14a08ae117
authorYabin Cui <yabinc@google.com>
Fri, 11 Nov 2016 01:35:46 +0000 (01:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 01:35:46 +0000 (01:35 +0000)
commit826173267aca3e20882dc8a902abcf2bb6b607f6
tree1e2ed1775d054706777764584cdf7ad85817ee0f
parentc98f0c774d1ef14b0c6a8cdc23978a66e2e81caa
parent7b3275b85bdbb22001971a7b4bb6e563ae003adf
Merge "simpleperf: use file records in protobuf output." am: 2a309ae76b am: 14a08ae117
am: 7b3275b85b

Change-Id: I1e2c275adc738696a68019058cc1ebf1d76c83e9