Andreas Huber 74400b2ef4 Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca8c035 am: 0bae9b1406 am: 0e686542e6 ...

am: 390cd6ceda

Change-Id: I0b1ba7490adaaec8f4eaa7e4afada7425f8c1129

2017-02-07 14:12:09 +00:00

..

java

Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62 am: cd6e0ee19d am: b7067e2b6c

2017-02-07 14:05:43 +00:00

jni

Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca8c035 am: 0bae9b1406 am: 0e686542e6

2017-02-07 14:12:09 +00:00

proto/android

Merge "Protobufferize BatteryManager dumpsys"

2017-02-03 20:50:12 +00:00

res

Merge "Import translations. DO NOT MERGE"

2017-02-07 04:31:15 +00:00

tests

Merge "Default the lastSelectetNetworkId to -1"

2017-02-06 23:00:26 +00:00