From: Jack He Date: Mon, 8 Jan 2018 22:21:43 +0000 (+0000) Subject: Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annot... X-Git-Tag: android-x86-9.0-r1~271^2~24 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7f706074b3b0a13421488e6658251c34d83c5277;p=android-x86%2Fframeworks-base.git Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations" am: 25259faa27 am: d16d93361b am: b1ebd51c01 -s ours Change-Id: I443bd449131bc242527229b3b238632d7ed1a8b7 --- 7f706074b3b0a13421488e6658251c34d83c5277