tree 60dbfd380f3e2444bf70de26f2f5ba287ff68e99
parent c91ed0851e80b4b5a3a33239b5c4ea86b0ddf9b7
parent e41ccb21d46f2d3e683c5629715e9f498a2b12e7
author Yi Kong <yikong@google.com> 1605159105 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605159105 +0000

Merge "profcollect: Use DeviceConfig to control trace parameters" am: be52daface am: 1bd94db820 am: 765230c02c am: e41ccb21d4

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

Change-Id: Ie83759f299d6cf4eea2ece4a7fca5d322ba7da39