tree 125d5661dea91eab5ee701ca97b8c57f7ec4afad
parent 33b46886344aead0c20327b0bc3da2bfbd14af0f
parent 14eb8cfe57833958c8a00f105179e15c53da15b6
author Pavlin Radoslavov <pavlin@google.com> 1486443167 +0000
committer android-build-merger <android-build-merger@google.com> 1486443167 +0000

Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am: ad62fd52c9
am: 14eb8cfe57

Change-Id: Ie5f7b5157a6034ec7a206758b19cd51e3713fc12