tree 7e7e4c49126039a6e0612144177d36aeed5210d2
parent 205a9b1b864739d9eb18578d275cb9f3e68183f1
parent 817345133916365fbb254b99798a59891ada3420
author Yabin Cui <yabinc@google.com> 1502739547 +0000
committer android-build-merger <android-build-merger@google.com> 1502739547 +0000

Merge "simpleperf: format inferno code." am: 504d653008 am: 03e42a04f0
am: 8173451339

Change-Id: I66ea3e2be21adba601740775452a66f07036c5f1