tree 2d5e1a59d3f64c7c0fe72ce2c2cebbb06ef8d502
parent 3db1ff462ab9394bef1e0a2e0904fa47fcb330f4
parent f23e80bb9b3c890b57dc0cd079d8ced2d2672217
author Pavlin Radoslavov <pavlin@google.com> 1485458737 +0000
committer android-build-merger <android-build-merger@google.com> 1485458737 +0000

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

Change-Id: If2d85eba17f7ece5b3d19e3ee8fc86b7cf9bc062