Merge branch 'refs/heads/CyanogenMod_cm-10.1' into cm-10.1

Change-Id: I66b1899a2390f874d087c819e0218330f78c448a
Merge branch 'refs/heads/jb-mr1.1-release' into cm-10.1

Conflicts:
	charger/charger.c

Change-Id: I3cc06e5cb6eab0bf0fda2fa0a00d66cc2582630d
fmradio: cleanup QCOM_HARDWARE/STE_FM defs and ifdef

Change-Id: I00b5e6536511b3bedee6105bf010ee2b5f2e36ac
Merge pull request #3 from CyanogenMod/cm-10.1

Cm 10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_system_core into cm-10.1
Add .gitreview for gerrit

Change-Id: I55bd700dae24fde842412c1810c20ed69baf9553
init: fix indentation and tab

Change-Id: Ia832ab4df5d955b2fa2b791baf9444aca21c2571
init: provide initial pemissions for ondemand governor

also set all governor permissions a bit late

Change-Id: I5c1445b31bcaf34a535efd7438fd612ada460ea2
libsysutils: fix null pointer and memory leak issue

In SocketClient::quoteArg function
1. Fix potential null pointer accessing issue
2. Fix potential memory leak introduced by realloc fail

Change-Id: I1ca0f9089290d43452e9a71428244545f4ed866b
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
Fixed reversed output in netstat Recv-Q Send-Q columns

Change-Id: I2bc7ac6c886808910212432497f05e34596f5e85
rootdir: Set permissions for additional ondemand sysfs nodes

Change-Id: Id39cab7ab69ea8f67de99f5b4ee342e2c52ebedd
lolcat

Change-Id: I4fecd80884a86c2d9bb720c9e821bd1605814d8c
Correct LOCAL_LDLIBS of adb

adb doesn't really use ncurses-libs, remove it.

Add -ldl for the symbols dlclose, dlerror, dlopen...
introduced from dso_dlfcn.c of libcrypto_static.a.

Change-Id: If1cc23987a9b35ec535bbf8f4e7db141b9f10af7
rootdir: Set permissions for additional interactive sysfs nodes

Change-Id: I2dbcdcc199c5f75d08e8ebf41cd6768c7648e27b
init.goldfish.rc: use ext4

Change-Id: Ib5e0bb0d199f09c9cb2d5903f77fae896d4720d6
Fix building without SELINUX

since the scon is now a mandatory arg, it needs to exist even if
NULL

Change-Id: I8ba31a7a8cf357e9b0c43cee81ab49d3eb192819
toolbox: Add levelFromUid categorization support to restorecon

This is necessary for the app data relabeling on migrated devices
to include the proper app context. Freshly installed apps get this
done automagically, as do newly created files.

Change-Id: If7421dac01c6ae8bd78e66f71e69298ed850a7ab
fs_mgr: Drop the context mount option from non-selinux builds

This will require that transitioning devices have context as the
last mount option, since everything after it will be ignored

Change-Id: Ic5cc7f5632cc3d62459dfaaf7719d662737e1641
Merge remote-tracking branch 'CM/cm-10.2' into HEAD

Conflicts:
	adb/Android.mk
	fs_mgr/fs_mgr.c
	include/private/android_filesystem_config.h
	include/system/audio.h
	liblog/logd_write.c
	rootdir/etc/init.goldfish.rc
	rootdir/init.rc
	toolbox/Android.mk
	toolbox/df.c

Change-Id: Icb46a1279f296deeec10dca61c8dc15137d8a4d4