Pavel Maltsev ce68c5d615 Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d am: b1e2bfe4df ...

am: 8a956a5141

Bug: 72828388
Test: frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest

Change-Id: I2f45d2c70c7c0142ae3b3ce9e6329c5f25b63380
(cherry picked from commit feb8d1498a)

2018-03-27 22:45:49 +00:00

..

java

Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d am: b1e2bfe4df

2018-03-27 22:45:49 +00:00

jni

Merge "Add isPivotSet/resetPivot" into pi-dev

2018-03-23 19:26:50 +00:00

proto

Merge "Fix statsd logging in BatteryStats (nesting prob.)" into pi-dev

2018-03-27 21:45:46 +00:00

res

Merge "Migrate from config.xml to SystemConfig for disabled carrier apps" into pi-dev

2018-03-27 21:48:06 +00:00

tests

Merge "Add auto battery saver suggestion notification/dialog" into pi-dev

2018-03-27 21:20:13 +00:00