Jakub Pawlowski c4e5e382d2 Merge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed am: 8c5b5b0c4b am: 96e331fb1c ...

am: 2ed8b54ee3

Change-Id: I132fc3ef24fd19600675d431a40e7e03afb75f9f

2017-04-01 04:59:52 +00:00

..

java

Merge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed am: 8c5b5b0c4b am: 96e331fb1c

2017-04-01 04:59:52 +00:00

jni

Merge changes from topic 'bitmapfactory-options-outdecodecolorspace' into oc-dev am: 81b292abdf

2017-04-01 04:32:15 +00:00

proto/android

…

res

Merge "Import translations. DO NOT MERGE"

2017-03-31 23:50:18 +00:00

tests

Merge "Change test type from InstrumentationTest to AndroidJUnitTest"

2017-04-01 01:22:46 +00:00