Erik Kline 7a42d3ad83 Merge "Split chooseUpstreamType() into two separate functions"

2017-02-15 00:38:50 +00:00

..

java/com/android/server

Merge "Split chooseUpstreamType() into two separate functions"

2017-02-15 00:38:50 +00:00

jni

Replace cutils/log.h and log/logger.h with android/log.h or log/log.h

2017-01-11 15:30:30 -08:00

proto

DO NOT MERGE: IpConnectivity metrics: add version number

2016-12-09 11:21:11 +09:00

Android.mk

Switch ConfigUpdater to the new version of timezone updater code

2017-01-04 16:16:21 +00:00