tree 6d78814c3a1691b2395a263cd4c4ea359c540389
parent 7c32a3f599458817e674be54e538b83b9a9aff0f
parent f965ffe0e2a42e753cf323a96d61309f8adc9187
author Yi Kong <yikong@google.com> 1619672471 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619672471 +0000

Merge "profcollect: alternative property to start profcollectd" am: 67bea71a2f am: f965ffe0e2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689805

Change-Id: I52018c828c4a8e6325df0d0845a8ced930ec9a0d