commit | 874ab0ef2109b90be15979e41c7c0641ad872394 | [log] [tgz] |
---|---|---|
author | Jakub Pawlowski <jpawlowski@google.com> | Thu Nov 09 23:04:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Nov 09 23:04:28 2017 +0000 |
tree | b255c371cae2f195c657f098608c8be4cf93378e | |
parent | 4a734916f16ada8cad3ae11365789953bde0f1b9 [diff] | |
parent | 64a1fbb8cf617978be0dc8bd9b4ce36dcb698e5e [diff] |
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067c2 am: 64a1fbb8cf Change-Id: I8e480c1ca3c1cdbd61e2b854bf4b42d1e81087ae