Andre Eisenbach efb1bda2d6 Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e am: 2d0ad3a9e7 ...

am: e81838f7e1

Change-Id: I62d424e92e10c1604938349e94ae38938557130c

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

..

java/com/android/server

Merge "Revert "Don't offer the BT sharing option to the user if BT is disallowed."" am: 0b9a18d21e am: 2d0ad3a9e7

2017-01-12 16:48:15 +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

…

Android.mk

Switch ConfigUpdater to the new version of timezone updater code

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