Hugo Benichi 6992f4edb3 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev ...

am: 6e269ec6fe

Change-Id: I4f6cbc0adb461cef6610460daeba72ca38b8f10c

2017-07-28 23:54:03 +00:00

..

java

Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev

2017-07-28 23:54:03 +00:00

jni

Merge "Update for less arguments in hidl toBinder." into oc-mr1-dev

2017-07-24 21:23:38 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

2017-07-28 23:10:01 +00:00

tests

Merge "Rename ACCESS_FM_RADIO to ACCESS_BROADCAST_RADIO permission." into oc-mr1-dev

2017-07-25 17:18:50 +00:00