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 22:57:56 +0000 (22:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Nov 2017 22:57:56 +0000 (22:57 +0000)
am: c82ac8affe

Change-Id: I28e463a68a19d6a39ee105807913320b294c1b31


Trivial merge