tree a538d8b34517b1efd50924ed3483806f2c9b8ab5
parent d2985c77d523563716aea1381a9f4ea8106f9546
parent 97f857560a56ae9dfb9784e9bcacf5e2413c1273
author Kalesh Singh <kaleshsingh@google.com> 1627502736 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627502736 +0000

[automerger skipped] Merge "mm_events: Add knob to remove mm_event tracing instance" am: f4d123f889 am: 97f857560a -s ours

am skip reason: Merged-In I89d7e5e1cd0d32b5612bc419b1a1c4b8c3c8ade6 with SHA-1 b9ba8cf2eb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1780365

Change-Id: I72b0229d429d95a8c16445af0607cca7472e9cca