Hugo Benichi 00a5f2a658 Merge "ConnectivityManager: no double NetworkCallback registration" am: 06a192fa49 am: 5983a772cb ...

am: 974e83cc0b

Change-Id: I73569fd084c14a78067e09565418f296994cd424

2017-03-02 08:12:09 +00:00

..

java

Merge "ConnectivityManager: no double NetworkCallback registration" am: 06a192fa49 am: 5983a772cb

2017-03-02 08:12:09 +00:00

jni

Merge "getTransport checks interface and instance names." am: 7f0300f1e2 am: 7719c1ad0d

2017-03-01 23:46:09 +00:00

proto/android

Merge "Protobufferize PowerManager dumpsys"

2017-02-24 21:36:19 +00:00

res

Merge changes Ic4370fa8,I81c43329,Ic563a8fe,I6d4be770,I858d1c95, ...

2017-03-02 00:52:52 +00:00

tests

Merge "Use context's userId in ContentResolver class."

2017-03-01 21:49:30 +00:00