Merge "simpleperf: show <> correctly in html report."
am: 562b983471

Change-Id: I92ce3fd32b841622b1f88df15e2918ab1cabd881