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
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
system/core: Add MSM specific formats, devices and channels.

- Add support for MSM formats, devices and channels

Change-Id: I0f613e25ae7e5bafa126ab582551807711ab9db6
(cherry picked from commit 3535a5eafaa700ae58d44c43c4491f3fbb90e060)
(cherry picked from commit d725c0473b0c7f51d157b8722131ed7b45f878d7)
(cherry picked from commit 8d43d24d91e7bcc8daef40c6e9f99fd8dcd23266)
audio: Fix submix output device check.

-AUDIO_DEVICE_IN_FM_RX is incorrectly matched
 with AUDIO_DEVICE_OUT_REMOTE_SUBMIX because
 method audio_is_remote_submix_device is not
 checking for AUDIO_DEVICE_BIT_IN.

-Fix is to add AUDIO_DEVICE_BIT_IN while doing
 the check for AUDIO_DEVICE_OUT_REMOTE_SUBMIX.

CRs-Fixed: 566837

Change-Id: I47ca3bd151da848a444d4bcf83a56e866f20d4f7
(cherry picked from commit f8573b76d6c03e1a9eff34e093056a810f898509)
(cherry picked from commit ae982a488c68e0cd06622e7ee7a31fddb1f4d131)
audio: remove QCOM_FM_ENABLED ifdefs

* CM is using a different ifdef here that enables these by default.

Change-Id: I07249d1c3555446238d846901481b13634967aab
Add back DurationTimer to fix camera.msm8960 load

cannot locate symbol "_ZN7android13DurationTimer5startEv"

Change-Id: I29d3283b644c773e6d798d17b2ef139a470048da
audio: Expose a few things previously under QCOM_HARDWARE

 * Allow everyone to use a few of these device types without
   setting QCOM_HARDWARE. Currently there is qute a mess due
   to the way QC is handling branches, when we figure out a
   good solution this can be reverted.

Change-Id: I75447a21ad1cf26e9683d2eac488a1b1238e5adb
Fix the build for devices with ICS/MR0_AUDIO_BLOB

The previous commit only exposed AUDIO_DEVICE_IN_ANC_HEADSET
and AUDIO_DEVICE_IN_PROXY if not defining this.

Change-Id: I7b644bb022f32fd978a85e003a97cbf27a17c809
sdcard: fix usage for -w and -s options

Change-Id: I0ef4299d2ccf99a18970f02d4bd4e7c28dc5335e
init: Fix queue_all_property_triggers with nonexistent properties

Don't queue actions for "on property=*" if the property does not exist.
This fixes these errors on boot:

    init: property 'sys.powerctl' doesn't exist while
    expanding '${sys.powerctl}'
    init: powerctl: cannot expand '${sys.powerctl}

Change-Id: I3bd354d73a860f856be5df2c654f940445f9efd9
unpackbootimg: Add support for detecting lz4 compressed ramdisks

This will check for lz4 magic, and if found change the extension of the
file. Else it'll fall back to the default behavior of assuming gzip. This has
been tested with stock LS980 boot images and LS970 boot images for lz4
and gzip respectively.

Change-Id: If2139ff172397b6db079ffb7ab9cb61897c38fb3
ueventd.rc: Change owner of graphics drivers to system

iWifi Display service needs permission to open these drivers.

Change-Id: I1d9e4ae372f09ecf4104888a9910d09903d892d1
(cherry picked from commit f087420bf5eada3017e107a3a8da4e74f683da18)
(cherry picked from commit 1b3f9226cd3ad681a0ef08038d874921ca62ee4c)
(cherry picked from commit 5b4becc1b814b0f9e96d4f3aaec380d74f4b0739)
Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1
healthd: disable periodic polled battery status

This change will stop too much of logging made by healthd in kernel logs

Change-Id: I85542f481bf9b688874598b4360a8692b2c4d34d