tree 81c0676af41927479e22c9b4c60dd2c184ca6b11
parent e066676c1900afcb2dc8d1bb0a4d35462a307043
parent 9db43ebe0ed4fcfbbced9754e94b6de33d902b24
author Yabin Cui <yabinc@google.com> 1492123513 +0000
committer android-build-merger <android-build-merger@google.com> 1492123513 +0000

Merge "simpleperf: fix pprof proto generator." am: d2b7f6afe5 am: d4f4c4518e
am: 9db43ebe0e

Change-Id: I10fa5f40ccbdee997aa43b318c49e7c3c0e19f55