merge in klp-release (no-op)
vold no longer does MS_MOVE; remove tmpfs.

MS_MOVE was used when staging external storage devices, which no
longer occurs.  In fact, having a writable tmpfs was masking a vold
bug around moving apps to SD cards.

Bug: 11175082
Change-Id: Ib2d7561c3a0b6fde94f651a496cb0c1f12f88d96
Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-dev
Revert "charger: Update to match AOSP recovery API"

This reverts commit d00b7c086f89d519f679614790e6b3c27a398ee9.
charger: Allow home key on newer devices to wake device

 * On newer devices, the home key button is usually mapped
   to KEY_HOMEPAGE. Allow it to wake the device.

Change-Id: I6423e4c6fb7992c77dc052a9f0aadae1fa8055dd
Don't return immediately from reboot commands.

The reboot commands return too fast, interfering with testing.
Add a pause(), which will allow the device time to complete the
reboot.

Change-Id: Ie9cc6eea67b7ff662ec71ea2329cbb94f8d55404
Bug: 11369303
utils: Add ProcessCallStack to collect stack traces for all threads in a process

- Also add a Printer class (print lines to logcat, fd, or strings)

Bug: 11324229
Change-Id: I78435ed49aa196a0efb45bf9b2d58b62c41737d3
Merge "utils: Add ProcessCallStack to collect stack traces for all threads in a process" into klp-dev
utils: Fix broken build

Bug: 11324229
Change-Id: I7e4f514c5531e4c0c11bb0ba5d67e4dabbcd5792
utils: Fix broken sdk build on windows

Bug: 11324229
Change-Id: Ia50e79b5e2430faea77b0c98902e8e018fb9ceff
Merge tag 'android-4.4_r1' into cm-11.0

Android 4.4 Release 1.0

Conflicts:
	fs_mgr/include/fs_mgr.h
	include/private/android_filesystem_config.h
	include/system/audio.h
	init/devices.c
	init/init.c
	init/property_service.c
	libcorkscrew/arch-x86/backtrace-x86.c
	liblog/logd_write.c
	rootdir/init.rc
	sdcard/Android.mk
Revert "Revert "put back the unused virtuals in Vector<>""

This reverts commit 225c66a48cdc3acef21ee380dc134449749d3cb3

Change-Id: If31a04b81052cbc7dd7bf237c07107c33066d03d
Revert "init: implement a new 'log' command, useful to debug property events"

This reverts commit 43a658562da8363fd8faa1add7acccba2b895f72.
Revert "get rid of HAL pixelformats 5551 and 4444"

This reverts commit 6bac41f1bf9b651523a2f9f119c2adb0836eb6b7.
Small 4.4 fixes
libutils: refbase: jellybean mr1 compat

Change-Id: Ideee0c3814a17b47f70fd612d27067fe19ae698d
Revert "Revert "charger: Update to match AOSP recovery API""

This reverts commit be76d13ad339e18b3c6b8a21ec6571681bc0a149.
Add libminshacrypt static lib

This is a sha-only version of libmincrypt, to provide the new
SHA_hash implementation to binaries that require libcrypto_static
Fix audio flags ifdeffing for qcom

Change-Id: I8183eaabe9ca9951f06256dfc761617f7c38b3d4
Revert "qcom-fm: audio: Add support for FM feature"

This reverts commit efa61acad6d546bac3f4886d38ff932eda4807a2.

Change-Id: I1c12a4ffb4ffdefe82b1c45fefa27ef079c71ac2