| リビジョン | 12cda34bb5988755203fc29a429479f807dae706 (tree) |
|---|---|
| 日時 | 2016-10-06 07:14:46 |
| 作者 | Jaap Jan Meijer <jjmeijer88@gmai...> |
| コミッター | Jaap Jan Meijer |
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
adb/Android.mk
adb/adb.cpp
adb/adb.h adb/adb_auth.h adb/adb_auth_client.cpp adb/adb_auth_host.cpp adb/adb_utils_test.cpp adb/commandline.cpp adb/file_sync_client.cpp adb/line_printer.cpp adb/services.cpp adb/shell_service.cpp base/logging.cpp debuggerd/debuggerd.cpp debuggerd/tombstone.cpp fastboot/Android.mk fastboot/fastboot.cpp fastboot/socket_test.cpp fs_mgr/Android.mk
fs_mgr/fs_mgr.c fs_mgr/fs_mgr_format.c fs_mgr/fs_mgr_fstab.c fs_mgr/fs_mgr_priv.h fs_mgr/fs_mgr_verity.cpp fs_mgr/include/fs_mgr.h healthd/Android.mk healthd/BatteryMonitor.cpp healthd/BatteryPropertiesRegistrar.cpp healthd/BatteryPropertiesRegistrar.h healthd/healthd.cpp healthd/healthd_board_default.cpp healthd/healthd_board_msm.cpp healthd/healthd_mode_charger.cpp healthd/include/healthd/BatteryMonitor.h healthd/include/healthd/healthd.h include/android/log.h include/cutils/iosched_policy.h include/private/android_filesystem_config.h include/system/camera.h include/system/graphics.h init/Android.mk init/NOTICE init/builtins.cpp init/devices.cpp init/init.cpp init/property_service.cpp init/property_service.h init/service.cpp init/service.h init/ueventd.cpp init/util.cpp init/util.h init/vendor_init.cpp init/vendor_init.h libbacktrace/backtrace_offline_test.cpp libcrypto_utils/Android.mk libcrypto_utils/android_pubkey.c libcrypto_utils/include/crypto_utils/android_pubkey.h libcrypto_utils/tests/Android.mk libcrypto_utils/tests/android_pubkey_test.cpp libcutils/Android.mk libcutils/android_reboot.c libcutils/debugger.c libcutils/fs_config.c libcutils/iosched_policy.c libcutils/threads.c libdiskconfig/Android.mk libnetutils/ifc_utils.c libsysutils/Android.mk libutils/SystemClock.cpp libutils/Threads.cpp logcat/logcat.cpp mkbootimg/Android.mk mkbootimg/mkbootimg mkbootimg/unpackbootimg rootdir/Android.mk rootdir/init.environ.rc.in rootdir/init.rc rootdir/init.usb.configfs.rc rootdir/init.zygote32_64.rc rootdir/init.zygote64_32.rc rootdir/ueventd.rc sdcard/Android.mk sdcard/main.c sdcard/sdcard.c toolbox/Android.mk toolbox/restart.c
Android-x86
Fork