[automerger skipped] [media]: refactoring AudioSystem.cpp to C++ style am: 4b107fa0fa am: b685cd58f3 am: c9fe1ad728 -s ours am: 3e541be25c -s ours
am skip reason: Merged-In I6e61ba1cd8ce279a69389e7cc66f7961d92f8c35 with SHA-1 79586a4c90 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2619399
Change-Id: Ic4a6c818dbdbe74e8081f6d085cbab8e3ed6a2c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: