tree 88c3cfe152d33784c56b8fffed2307fd50d983eb
parent 208a55a03432dfa8c2790d6c536a670f0be132f9
author Chris Craik <ccraik@google.com> 1431476716 -0700
committer Chris Craik <ccraik@google.com> 1431477055 -0700

Sync to latest trace-viewer

bug:20761637

Cherry-pick of 26c92f4cb78a275f1ebb94dd976f37bdd7d53ce7 from AOSP

Change-Id: I645b485ff2643b6efbec1fa25de6fc81a98c3ee5