tree f0d9177fd436246731fda429187ae3569f2af76f
parent bf055d8095dd44134ee6dc5262dd7b079cd7a93a
parent 47a2c27af13252ed4f2ffc0a6a7c83ab8f85f99f
author Pavlin Radoslavov <pavlin@google.com> 1517011954 +0000
committer android-build-merger <android-build-merger@google.com> 1517011954 +0000

Merge "Add support for Multi-A2DP state machines per device" am: e61ac8ec02 am: a84302f194
am: 47a2c27af1  -s ours

Change-Id: I2bfe98b532c6fb16e7aaf67f20052271514daf45