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:30:31 +0000 (22:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Nov 2017 22:30:31 +0000 (22:30 +0000)
commit64a1fbb8cf617978be0dc8bd9b4ce36dcb698e5e
tree2c1b72c9a39157b4144ab4b424dc8b615a842966
parent6e78c792b1570af9e18251c8ce18081ad0ea35f0
parentb2bde067c2b0ec1f896af26ebcb97fdafa31fca3
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"
am: b2bde067c2

Change-Id: I3c067c01d6fba25022e80950eb77c3d98405b481