tree 9e7586c36a348ee87c90a798facc9e348d48c155
parent 163ed6f6b193975ffa86961f27580369a3118676
parent 7fe1afc8a76733a3d1142432769f077873526bf9
author Yabin Cui <yabinc@google.com> 1483744645 +0000
committer android-build-merger <android-build-merger@google.com> 1483744645 +0000

Merge "simpleperf: fix annotate.py." am: 9e6a8022f9 am: 4f519c445a am: a34d6bfd00
am: 7fe1afc8a7

Change-Id: Ia28053891fd6fa6a3c658488df51d09318f309d9