Grant sdcard_r to ril-daemon.

Bug: 6793799
Change-Id: Ife23c98c30d7b08479d75798c7075005bf281119
merge in jb-mr0-release history after reset to jb-dev
Mount/unmount filesystems before running e2fsck

This works around a performance problem in the firmware of
some emmc chips.

Change-Id: Ia414b4604d11e47ce9cb3f86ac82602e081bb09e
merge in jb-mr0-release history after reset to jb-dev
core: Add API to retrieve mtu size

Adding an API to libnetutils to retrieve mtu size of an interface
Made few utility functions from ifc_utils public

Change-Id: Iddec2dcd9f241b146d7f362e2df0724cf740d1f2
(cherry picked from commit 108cded7d96cc347f36b5b78c404c5ebccce13d7)
charger: make default to not suspend in charge mode

  * http://r.cyanogenmod.com/#/c/19760 made the device suspend in
    charge mode when the animation was not displayed. Previously
    the device never suspended.
  * The above change broke charging mode on some (maybe many?) devices
    that do not properly handle suspending in charge mode.
  * This change brings back the more compatible default behavior of
    not suspending in charge mode and introduces a new BoardConfig.mk
    variable called BOARD_ALLOW_SUSPEND_IN_CHARGER that, when set to
    true, will suspend in charge mode.
  * This allows devices that support suspend in charger to opt-in
    instead of having to opt-out previously working devices.

Change-Id: I5a480e34ba5946a52e371ac79a965ecee5471c5a
Merge "core: Add API to retrieve mtu size" into jellybean
Add HTC Logging functions to support newer HTC props.

ifdef'd with HTCLOG.

Patchset2: remove unused function.

Patchset3: add indents to returns.

Change-Id: I70d0a6878dddf0f41d96735febda82c93496d8ec
toolbox/dmesg: do not hardcode KLOG_BUF_LEN

Change-Id: Ia99654a53d6adfeba5a5088b7cff45c6e47b6188
Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/system/core into aosp-merge

Conflicts:
	rootdir/init.rc

Change-Id: I438743e976c6709088458f1a8dbec4fb974dd8fa
Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" into jellybean
adbd:fix framebuffer handle when(fbinfo.size % 640 != 0)
init.rc: Fix compcache and cleanup init file

The "import" keyword is only parsed once, for a one shot execution, during
the initial section setup, and before running "on fs". Having an import of
a file that's located in a filesystem other than root will result in an error
like

<3> init: could not import file '/system/etc/init.local.rc' from '/init.rc'

So... any files imported into init need to be moved to the root fs.
While we're at it, move init.rc changes that are specific to CM (and don't
involve modification of preexisting configs) into this file, to ease future
upstream merges.

Change-Id: I0f70ffad874648198acde67c12e1a7833552ad7c
Provide permission for graphics to set service.bootanim.exit prop

Change-Id: If23d14172022907fcefdcf7430904eb560d4d64c
libion: Disable for omap3

the omap3 HAL repository has its own modified libion, which is
necessary for the openmax libraries

Change-Id: Ic6f175fe456a2891d5556d937c3073215b861981
init: Allow device-specific appends to the property service permission structs

Extends device_perms.h API to allow property_perms and control_perms to be
appended on a device-specific basis, without needing to redefine the entire
struct contents.
merge cm

Change-Id: If35451eef61724f3f9892f1d5f76c7c8297ef425