Hisanobu Watanabe 92d16f70d7 Merge "VPN reconnection fails after manually disabling VPN" ...

am: ba17ea752b

Change-Id: I8ff02f8d1fe4989cb92949ab85aade598c8cff00

2017-01-16 17:59:55 +00:00

..

java/com/android/server

Merge "VPN reconnection fails after manually disabling VPN"

2017-01-16 17:59:55 +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