From: Hansong Zhang <hsz@google.com>
Date: Sat, 16 Feb 2019 04:25:52 +0000 (-0800)
Subject: Merge "Rename a2dp_software_encoding to a2dp_encoding" am: ad392e481f
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=171df63372;p=android-x86%2Fsystem-bt.git

Merge "Rename a2dp_software_encoding to a2dp_encoding" am: ad392e481f
am: 8994b9c6d3

Change-Id: I22e9e6d052870e04aae0839df13b049d1ade1422
---

171df633726cd1b00f24530c4d726f54292eb73d