Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
FW: add spacers to Traditional Toggles.

Scrollable toggles merge also included adding backgrounds to
traditional toggles.  on rows that didn't have 6 Toggles,
those backgrounds would be stretched.  This adds
spacers on the ends of the last row to force the toggles/
backgrounds to keep the proper size/shape.
samples:

http://twitpic.com/cecf8t
http://t.co/32t0A6Qc6T

PS2:  Include background drawables on spacers. Looks a little more
uniform.  Samples:

http://t.co/ryaHhizEgF
http://t.co/fw5QZAsocQ

Change-Id: Id086383ec72e682b8f005e9a17b6ecb6bd0e018b
Signed-off-by: Zaphod <mwilson@acesappraisal.com>
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1

Conflicts:
	fmradio/java/com/stericsson/hardware/fm/FmReceiverService.java
	fmradio/java/com/stericsson/hardware/fm/FmTransmitterService.java
	fmradio/jni/android_fmradio_Receiver.cpp
MDPI devices compatibility

Patch-set 1: Now Lockscreen configuration in ROMControl doesn't crash

Signed-off-by: utak3r <piotr.borys@gmail.com>

Change-Id: I405331498128ee59b0603dc191db5adfa8d0db89
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
OOM adj and lowmem values
Merge "FW: add spacers to Traditional Toggles." into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
SysUI : Fix opacity of LastApp Icon

Thanks to Nitroz for making alpha corrected versions of the
last app icon.

Change-Id: I2e8a9ae36e32f03aa36d3218c74d76b88123e64e
Signed-off-by: Zaphod <mwilson@acesappraisal.com>