Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a30db07b authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge changes Ie4161bb9,I6e61ba1c into udc-dev-plus-aosp am: 97dc5e27 am:... 

Merge changes Ie4161bb9,I6e61ba1c into udc-dev-plus-aosp am: 97dc5e27 am: 87b74bce am: 18505f6d

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



Change-Id: I318eedb24f90701a73f86efeb95869abd420b6a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6b1b262 18505f6d

core/jni/android_media_AudioSystem.cpp

+610 −739

File changed.

Preview size limit exceeded, changes collapsed.