tree 1b00a6945bdee289f44b97d8783f1d6e6cdcfb47
parent 666e59f911376e3c9c04b456a0d589643955e167
parent d36420838860305096bf733bab4e180e0529bd62
author Pavlin Radoslavov <pavlin@google.com> 1485459067 +0000
committer android-build-merger <android-build-merger@google.com> 1485459067 +0000

Merge "Integration of the AAC codec for A2DP source" am: 22f97c83fb am: f23e80bb9b
am: d364208388

Change-Id: Ice6067732c4a94d30410a8f90cbea51b869539eb