Andrew Scull 4c349b67aa resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 ...

am: 9af145dcc4

Change-Id: I15cb7dbf619355f22f27e81aa1465683bac7e619

2017-01-13 21:25:50 +00:00

..

java/com/android/server

resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1

2017-01-13 21:25:50 +00:00

jni

Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b am: d1740f0f5b

2017-01-12 15:59:48 +00:00

proto

DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics

2016-12-15 21:31:25 +09:00

Android.mk

Switch ConfigUpdater to the new version of timezone updater code

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