merge changes from Omni 4.4 into local branch
merge changes from Omni 4.4 into local branch
merge changes from Omni 4.4 into local branch
merge changes from Omni 4.4 into local branch
Revert "Add a circlular memory indicator to the recent panel view (2/2)"

This reverts commit 7f17dfb415a9756737c98c05a6ba6584fc34fa19.
merge changes from Omni 4.4 into local branch
[2/2] Fix rivaling drawable name

Change-Id: I0110c1e9d6387eb93097872d9ed53fbf13e9a4ea
Revert "OmniGears: [2/3] Customizable lockscreen & navring targets"

This reverts commit bc00afebaee96fcaab2ff97cec783e19f335f4ab.
Merge branch 'head' into kitkat
merge changes from Omni 4.4 into local branch
merge changes from Omni 4.4 into local branch

Conflicts:
	res/xml/bars_settings.xml
	res/xml/more_interface_settings.xml

Change-Id: I9334a4926f58c67cdf3039f62cb2e4812fcbc014
merge changes from Omni 4.4 into local branch

Conflicts:
	res/xml/bars_settings.xml
	src/org/omnirom/omnigears/interfacesettings/BarsSettings.java

Change-Id: Ibd0248eb0ba5fb71a2984656d21daa77f6d2cb07
Merge branch 'head' into old

Conflicts:
	res/values/custom_strings.xml
	res/xml/bars_settings.xml
	src/org/omnirom/omnigears/interfacesettings/BarsSettings.java

Change-Id: Ic3156f45c241f0d661081fc5bebe260551d22498