tree c75ff049c1adf83ce6cd526006d78adfe33bc1be
parent 0ab1bc47f84e0d8e19490afe6f910b00fa736814
parent 74558cbfdc37295add7371fa45edf8b882bb65a6
author Treehugger Robot <treehugger-gerrit@google.com> 1632894066 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632894066 +0000

Merge "pprof_proto_generator: friendlier sample_types" am: 149e735479 am: 74558cbfdc

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

Change-Id: I5205b1c9d2f54d02074996b7b94fe6bbcfdb15bb