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
healthd: Reinitialize mChargerNames for every battery update

Booting up the device without the usb sets the usb power supply
type as UNKNOWN. Due to this mChargerNames gets incorrectly
initialized at bootup. The value of usb power supply type changes
at run-time. So it makes sense to update mChargerNames everytime
we have a battery related update.

Change-Id: I2ec9f9a420ca61814d43c316b418ce94de3691bc
Merge "healthd: Reinitialize mChargerNames for every battery update"
charger: Toggle backlight while in charger mode.

The backlight is now toggled on/off in the charger mode via a sysfs
node. This is to compensate for the fact that on certain targets the
FBIOBLANK ioctl does not turn off the backlight.

Change-Id: I7c4531e7f1b0599b9a1f5ed6f95d13ee6a664066
CRs-fixed: 514940
system: core: increase the polling time for remount_ro to 3600

eMMC4.5 introduces an addition of cache on the device.
We experienced long flush durations in some of the devices,
and therefore the adb reboot resets the target before the flush
completes.
Latest tests show that increasing it to 2400 wasn't enough thus
it was increased to 3600.

Change-Id: Ifbe7af16aa1861d0d57c808b0240361c0317d5c5
CRs-fixed: 581363
Merge commit 'android-4.4.1_r1' into merge_branch

* commit 'android-4.4.1_r1':
  utils: Fix broken sdk build on windows
  utils: Fix broken build
  utils: Add ProcessCallStack to collect stack traces for all threads in a process
  Don't return immediately from reboot commands.
  vold no longer does MS_MOVE; remove tmpfs.
Merge "system: core: increase the polling time for remount_ro to 3600"
Merge "Merge commit 'android-4.4.1_r1' into merge_branch"
Merge "charger: Toggle backlight while in charger mode."
sdcard: Allow building as a static library

 * Split main() out in order to allow linking with a multi-call
   executable such as recovery.

Change-Id: I3325135e47e4dd5af3912f5ce67ec64007d54a63

Conflicts:
	sdcard/Android.mk
WIP: CWM recovery fstab features.

Change-Id: Ibb4c910ab7f3c377a8f358214d58357c40d5811a

Conflicts:
	fs_mgr/include/fs_mgr.h
core: Add some static libraries

 * Add static versions of libdiskconfig and libsysutils for MiniVold

Change-Id: I9ea9498dcff3f094bbcbb1e05e6d10bc9b83ac74
Fix gr_text() syntax until minui gets updated

Change-Id: Ie6d72013944d7ce6d2c0a244862b464e513fa389