Hugo Benichi cd7393c641 Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23 ...

am: f2ac860b7c

Change-Id: I01e287b4df82a53a522566d33b3166f7801badca

2017-08-16 12:14:09 +00:00

..

java

Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" am: b35719a057 am: 2f9fd9df23

2017-08-16 12:14:09 +00:00

jni

Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am: 3f378940c2

2017-08-11 20:12:31 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Merge "Add config option to enable/disable pause workaround."

2017-08-14 16:29:04 +00:00

tests

Fix flaky IpPrefixTest.

2017-08-08 14:54:08 +09:00