tree 644a32e0846f1f227dee24a71fc0a1242b0bafa3
parent 024e39df1003b0dc6544e772e7667c632b64ffc1
parent a34d6bfd00d1cee0cd1adae429f92070d7c99969
author Yabin Cui <yabinc@google.com> 1483744404 +0000
committer android-build-merger <android-build-merger@google.com> 1483744404 +0000

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

Change-Id: I87d4bc0b802b435908f68b7e6a391e90f5ee335c