tree d2ab8c4f504cd1bd73e0f754a03d9929e9a6f073
parent 95a21ce1164425106bf702fc98f149ff3dad360c
parent 74768476e8a13baede9f2089268226a6462cde09
author Yabin Cui <yabinc@google.com> 1503006581 +0000
committer android-build-merger <android-build-merger@google.com> 1503006581 +0000

Merge "simpleperf: fix inferno and test content of report.html." am: 001e76be63 am: f9ec53fc3f am: f5967b2d97 am: e0b740daf3
am: 74768476e8

Change-Id: I48ebf5f59b2b8dfcbcefff67aabb45ea69a11a30