OSDN Git Service

Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"
authorJakub Pawlowski <jpawlowski@google.com>
Thu, 9 Nov 2017 22:20:55 +0000 (22:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Nov 2017 22:20:55 +0000 (22:20 +0000)
am: ba0ad409f9

Change-Id: Icdae1e38689fb8f685a441083074386303a06e7a


Trivial merge