OSDN Git Service

resolve merge conflicts of 1922726 to master
authorDan Willemsen <dwillemsen@google.com>
Tue, 13 Sep 2016 04:34:12 +0000 (21:34 -0700)
committerDan Willemsen <dwillemsen@google.com>
Tue, 13 Sep 2016 04:34:12 +0000 (21:34 -0700)
commit03e86bd24028c4d4e39c03214f0e9daa372f0fcf
treeb66dc4d629e523270065420c6791b9135b778d3f
parent337d2b758ea936ec71ba35cb4caf832448349009
parent19227261b8e56fca8ae2cb8015b4970d16f4bc18
resolve merge conflicts of 1922726 to master

Change-Id: Ic5c6dd33569fbdae9e236fe2bf5bd30bea038cbf
audio_utils/Android.bp
audio_utils/tests/Android.bp