From: Jakub Pawlowski <jpawlowski@google.com>
Date: Thu, 9 Nov 2017 22:57:56 +0000 (+0000)
Subject: Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_nati... 
X-Git-Tag: android-x86-9.0-r1~175^2~2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cb259f6ce1af6089dbb5d9b325195b17473ac69f;p=android-x86%2Fsystem-bt.git

Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: ba0ad409f9
am: c82ac8affe

Change-Id: I28e463a68a19d6a39ee105807913320b294c1b31
---

cb259f6ce1af6089dbb5d9b325195b17473ac69f