manually patch location provider fix from this gerrit patch:

http://review.cyanogenmod.org/#/c/29349/

Change-Id: I3057018148020fac311d74e2099280eb63797257
Disable ScrollingCache (credit: blahb14hblah)

Change-Id: Ib67a26fca5ad5868c43781aa887089434dd615d2
Revert "Remove dock home support."

This reverts commit 7c135205f2f4c192299ad0215276e9e481bccaa5.

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I9b2c4eebaab87a669b42681e70ec5324dadf7f6d
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base.git into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base.git into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base.git into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base.git into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base.git into cm-10.1
frameworks: updated finnish translations

Change-Id: I84eed37a006c61a64e2d13c9a8643c423482424b
Update Russian Translation-SystemUI-CM10.1
Remove log noise

Change-Id: I1801020ee7ca0e0518a2ec5abb36d6c48d0dd4ef
Added hungarian translation for quick_settings_lte

Change-Id: I4a4bbed3d97ac63186e0e1e095ca12117b848207
FM Radio: avoid deadlock when disabling RDS

When RDS is being configured, the session mutex is hold. However,
when it is being disabled, RDS callbacks might still fire, and these
also try to hold the mutex, leading to a deadlock.

Temporary unlock the mutex while the vendor library is called to
work around.

Change-Id: Ic9751c7185fd8de4a7510225f54d23a22f042321
implement 1% battery on select devices

via ro.product.use_charge_counter=1

Change-Id: I6ae67e36382038c84cd017bc015c9b46b40a59da
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1