Erik Kline 52e97fcb8a Merge "More concisely export whether we have a "tetherable configuration"" am: edea114308 am: 9d02ee9030 ...

am: fa0b8e4cee

Change-Id: Iba07ae91906fa2f0763dae831f56b4841572e1f1

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

..

core/java/com/android/server

Merge "More concisely export whether we have a "tetherable configuration"" am: edea114308 am: 9d02ee9030

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

net/java/android/net

More correct startup and shutdown procedures.

2016-12-15 10:43:41 +09:00

tests/servicestests

Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp

2017-01-18 19:59:59 +00:00