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

am: 52e97fcb8a

Change-Id: I290df5269739bc7fb5ebc8614a96c38bf7faf367

2017-01-23 07:30:22 +00:00

..

core/java/com/android/server

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

2017-01-23 07:30:22 +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