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

am: d1e7fc23ae

Change-Id: I31ef741eb83d64c476e5930d5762514b5d4cb16f

2017-08-16 18:39:54 +00:00

..

java/com/android/server

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

2017-08-16 18:39:54 +00:00

jni

Merge "Implement region guessing." into oc-mr1-dev

2017-08-12 00:34:41 +00:00

Android.mk

…