tree 57363e4740bade90679c3d3dc975a66ab74270cd
parent 28168b6195af02e9e79eada4938f8fa7a582bfbb
parent 52ef0c29a51c6012805f6986a4f8b8187c0a170b
author Mark Hansen <markhansen@google.com> 1632886611 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632886611 +0000

Merge "pprof_proto_generator: Set units for common events" am: 3f58f74f03 am: 38198a762a am: 52ef0c29a5

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

Change-Id: Icb61c8df0bef295ccf98a13318ab9fb0492e0f7b