Jakub Pawlowski 874ab0ef21 Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067c2 ...

am: 64a1fbb8cf

Change-Id: I8e480c1ca3c1cdbd61e2b854bf4b42d1e81087ae

2017-11-09 23:04:28 +00:00

..

java

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

2017-11-09 23:04:28 +00:00

jni

Merge "Disable integer sanitizer in release function." am: 969ceebc5d

2017-11-08 20:28:30 +00:00

proto/android

…

res

Import translations. DO NOT MERGE

2017-11-06 22:40:03 -08:00

tests

Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 am: 49dfdd66cc am: eb4598afba am: a2149abe3a am: 560fb5d050 am: 2edd31e7fc

2017-11-08 01:13:26 +00:00