tree 3f14b544394bbccedfd441c6ed695043b9a8f1b1
parent 5741187f311979a227e9375fbdf0f3cc0cd255e9
parent 0356b740f2cc3e6e9750fe12c3e10ad2c4fb1c8c
author Pavlin Radoslavov <pavlin@google.com> 1486010149 +0000
committer android-build-merger <android-build-merger@google.com> 1486010149 +0000

Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc
am: 0356b740f2

Change-Id: I359020a85c6bc8a5201018f31f5f9fd274b2b94d