tree 64308a6ead5e05b93d853f8cbedbe6ea9cc4399a
parent 51f7ecfe2c1049f3e95e40bcae7ca34fffd73145
parent 0b15b130c20513686173174c63c6bee1e95e3a2c
author Yabin Cui <yabinc@google.com> 1472607829 +0000
committer android-build-merger <android-build-merger@google.com> 1472607829 +0000

Merge "simpleperf: fix two errors." am: 9baf7c33bb am: fc62dc7f69 am: ddd70a190f
am: 0b15b130c2

Change-Id: I40205d0cd36c8a3a0b253589434075b4bbbf6c11