tree c54f21e8191fd4090b0c9e58656597dcf913a964
parent 9478bf8b405097d2b2d9f525ee6f116013b8552b
parent 9baf7c33bbcd40b83af6c3e18ab4b5d4f2897932
author Yabin Cui <yabinc@google.com> 1472606942 +0000
committer android-build-merger <android-build-merger@google.com> 1472606942 +0000

Merge "simpleperf: fix two errors."
am: 9baf7c33bb

Change-Id: Iaaef78effbbbacbdb6f7d764f998f1681289b0da