Commit: 12cda34bb5988755203fc29a429479f807dae706 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Revision: 12cda34bb5988755203fc29a429479f807dae706 (tree)
• Time: 2016-10-06 07:14:46
• Author: Jaap Jan Meijer <jjmeijer88@gmai...>
• Commiter: Jaap Jan Meijer

Log Message

Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86

Conflicts:
init/devices.cpp
init/init.cpp
init/ueventd.cpp
libcutils/fs_config.c
libdiskconfig/Android.mk
libpixelflinger/tests/codegen/Android.mk

Change Summary

• modified: adb/Android.mk
• modified: adb/adb.cpp
• modified: adb/adb.h
• modified: adb/adb_auth.h
• modified: adb/adb_auth_client.cpp
• modified: adb/adb_auth_host.cpp
• modified: adb/adb_utils_test.cpp
• modified: adb/commandline.cpp
• modified: adb/file_sync_client.cpp
• modified: adb/line_printer.cpp
• modified: adb/services.cpp
• modified: adb/shell_service.cpp
• modified: base/logging.cpp
• modified: debuggerd/debuggerd.cpp
• modified: debuggerd/tombstone.cpp
• modified: fastboot/Android.mk
• modified: fastboot/fastboot.cpp
• modified: fastboot/socket_test.cpp
• modified: fs_mgr/Android.mk
• modified: fs_mgr/fs_mgr.c
• modified: fs_mgr/fs_mgr_format.c
• modified: fs_mgr/fs_mgr_fstab.c
• modified: fs_mgr/fs_mgr_priv.h
• modified: fs_mgr/fs_mgr_verity.cpp
• modified: fs_mgr/include/fs_mgr.h
• modified: healthd/Android.mk
• modified: healthd/BatteryMonitor.cpp
• modified: healthd/BatteryPropertiesRegistrar.cpp
• modified: healthd/BatteryPropertiesRegistrar.h
• modified: healthd/healthd.cpp
• modified: healthd/healthd_board_default.cpp
• add: healthd/healthd_board_msm.cpp
• modified: healthd/healthd_mode_charger.cpp
• modified: healthd/include/healthd/BatteryMonitor.h
• modified: healthd/include/healthd/healthd.h
• modified: include/android/log.h
• modified: include/cutils/iosched_policy.h
• modified: include/private/android_filesystem_config.h
• modified: include/system/camera.h
• modified: include/system/graphics.h
• modified: init/Android.mk
• modified: init/NOTICE
• modified: init/builtins.cpp
• modified: init/devices.cpp
• modified: init/init.cpp
• modified: init/property_service.cpp
• modified: init/property_service.h
• modified: init/service.cpp
• modified: init/service.h
• modified: init/ueventd.cpp
• modified: init/util.cpp
• modified: init/util.h
• add: init/vendor_init.cpp
• add: init/vendor_init.h
• modified: libbacktrace/backtrace_offline_test.cpp
• add: libcrypto_utils/Android.mk
• add: libcrypto_utils/android_pubkey.c
• add: libcrypto_utils/include/crypto_utils/android_pubkey.h
• add: libcrypto_utils/tests/Android.mk
• add: libcrypto_utils/tests/android_pubkey_test.cpp
• modified: libcutils/Android.mk
• modified: libcutils/android_reboot.c
• modified: libcutils/debugger.c
• modified: libcutils/fs_config.c
• modified: libcutils/iosched_policy.c
• modified: libcutils/threads.c
• modified: libdiskconfig/Android.mk
• modified: libnetutils/ifc_utils.c
• modified: libsysutils/Android.mk
• modified: libutils/SystemClock.cpp
• modified: libutils/Threads.cpp
• modified: logcat/logcat.cpp
• modified: mkbootimg/Android.mk
• modified: mkbootimg/mkbootimg
• add: mkbootimg/unpackbootimg
• modified: rootdir/Android.mk
• modified: rootdir/init.environ.rc.in
• modified: rootdir/init.rc
• modified: rootdir/init.usb.configfs.rc
• modified: rootdir/init.zygote32_64.rc
• modified: rootdir/init.zygote64_32.rc
• modified: rootdir/ueventd.rc
• modified: sdcard/Android.mk
• add: sdcard/main.c
• modified: sdcard/sdcard.c
• modified: toolbox/Android.mk
• add: toolbox/restart.c