Merge "fix missing headers"

author Tri Vo <trong@google.com>

Tue, 27 Jun 2017 01:22:12 +0000 (01:22 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 27 Jun 2017 01:22:12 +0000 (01:22 +0000)
author Tri Vo <trong@google.com>
Tue, 27 Jun 2017 01:22:12 +0000 (01:22 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 01:22:12 +0000 (01:22 +0000)
diff --cc alsa_utils/alsa_device_proxy.c
Simple merge
diff --cc audio_utils/Android.bp
Simple merge
author	Tri Vo <trong@google.com>
	Tue, 27 Jun 2017 01:22:12 +0000 (01:22 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 27 Jun 2017 01:22:12 +0000 (01:22 +0000)
		1	2
alsa_utils/alsa_device_proxy.c	patch \|	diff1 \|	diff2 \|	blob \| history
audio_utils/Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history