tree 4264b3e7f91a57ea98602f8cbebe894dd43e3b29
parent 09daa33baae8c0cd487ca7a810260c70edf78387
parent c9c8899421809d66665ceae31b2c1c9305ca0c39
author Yabin Cui <yabinc@google.com> 1620706353 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620706353 +0000

Merge "simpleperf: fix pprof_proto_generator.py." am: c9c8899421

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1701936

Change-Id: I449b37fc8e212e5d9f645713a8db9e9a10ddb2b3