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

Skip to content
Commit b39ff4c3 authored by Divya Sharma's avatar Divya Sharma Committed by Vaishali Gupta
Browse files

Merge tag 'AU_LINUX_ANDROID_LA.UM.0.0.07.01.01.197.552' into HEAD.

AU_LINUX_ANDROID_LA.UM.0.0.07.01.01.197.552 based on quic

Conflicts:
	audiod/AudioDaemon.cpp
	hal/audio_extn/audio_extn.h
	hal/audio_extn/sndmonitor.c
	hal/audio_hw.c
	hal/msm8916/hw_info.c
	hal/msm8916/platform.c
	hal/msm8974/platform.c
	qahw_api/test/qahw_multi_record_test.c
	qahw_api/test/qahw_playback_test.c

Change-Id: Ic7503df757110495946e481a58562018c67d680e
parents 033a3fbf deee8806
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment