Dan Willemsen 917bcc4df9 resolve merge conflicts of 69ed5d9 to stage-aosp-master am: d269bf4328 am: c1965c958c ... am: 0002fe0e75 Change-Id: I0c0f7b10857f97e0e4d4700069beaee0cc4cfd11		2016-07-13 19:30:24 +00:00
..
Android.bp	Begin converting Android.mk to Android.bp	2016-07-12 23:34:37 -07:00
audio_hw.c	audio_hw: Fix compiler warnings	2016-06-30 16:08:53 -07:00
audio_policy.c	Code changes for offload support in hardware libhardware	2013-07-18 09:23:27 -07:00