OSDN Git Service

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

Change-Id: I2c4f36f2102a85d5eb07f3a89666e4a25ad5ed09


Trivial merge