commit | c411b3d46b95adb2c4e376302f50fa5e76e4d761 | [log] [tgz] |
---|---|---|
author | Jakub Pawlowski <jpawlowski@google.com> | Thu Nov 09 23:34:22 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Nov 09 23:34:22 2017 +0000 |
tree | 1a7a46ef1a651c999c6c3599c9e49d9f43d6990a | |
parent | 5cc4679da279949846ebf00ebe351dc0c88f8328 [diff] | |
parent | 874ab0ef2109b90be15979e41c7c0641ad872394 [diff] |
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067c2 am: 64a1fbb8cf am: 874ab0ef21 Change-Id: Ib5b30de21a15ee6220ad4aa143216fb10839d709