OSDN Git Service

Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_nati...
authorJakub Pawlowski <jpawlowski@google.com>
Thu, 9 Nov 2017 23:04:28 +0000 (23:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Nov 2017 23:04:28 +0000 (23:04 +0000)
am: 64a1fbb8cf

Change-Id: I8e480c1ca3c1cdbd61e2b854bf4b42d1e81087ae


Trivial merge