tree edaeb61d341aa6a381f26b36880aa1a8180caa0c
parent 23dffdcb193a9f17d65bc3b421ff3c731d199395
parent 37b99f7b023ee605f1ad6995b6f96d573423d3a6
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1565310086 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1565310086 +0000

Merge "Revert "Read both vendor.audio_hal.* and audio_hal.* sysprops" am: 25054b7a66 am: a82bd205cb" into qt-qpr1-dev-plus-aosp