tree 2c1b72c9a39157b4144ab4b424dc8b615a842966
parent 6e78c792b1570af9e18251c8ce18081ad0ea35f0
parent b2bde067c2b0ec1f896af26ebcb97fdafa31fca3
author Jakub Pawlowski <jpawlowski@google.com> 1510266631 +0000
committer android-build-merger <android-build-merger@google.com> 1510266631 +0000

Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"
am: b2bde067c2

Change-Id: I3c067c01d6fba25022e80950eb77c3d98405b481