tree 644a32e0846f1f227dee24a71fc0a1242b0bafa3
parent e1172ef700cc0070068f442d45e0cb551b3a6aa9
parent 9e6a8022f93e62a3d372a5aba640f98a36681b6e
author Yabin Cui <yabinc@google.com> 1483743924 +0000
committer android-build-merger <android-build-merger@google.com> 1483743924 +0000

Merge "simpleperf: fix annotate.py."
am: 9e6a8022f9

Change-Id: I84a8cec3fa66c348aa6f3fc15541ce56dd66f260