From: Pavlin Radoslavov Date: Thu, 27 Aug 2015 10:55:02 +0000 (+0000) Subject: am 8ad14e31: (-s ours) resolved conflicts for merge of 65f9c04a to mnc-dev-plus-aosp X-Git-Tag: android-x86-7.1-r1~522^2~224 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=015db146f887765351e4f3bc45a46c809ba5d13a;p=android-x86%2Fsystem-bt.git am 8ad14e31: (-s ours) resolved conflicts for merge of 65f9c04a to mnc-dev-plus-aosp * commit '8ad14e310bf2e535c09e67c6a20e1caf989fb3a6': --- 015db146f887765351e4f3bc45a46c809ba5d13a