Set app close to 1000ms

Change-Id: I2a0d769db98142f816001631128d48787e0644d5
Build with Linaro 4.7

Change-Id: I170e4b186da4239711699ab7f7775815cb462682
Add Mackay kernel settings to Galaxy-S advanced device settings

Add Wifi PM settings
Add Fast charge settings
BLX settings
Shortcut to governor & scheduler
Add AriesParts to the Launcher

Change-Id: I964e7a93e40e2d832d26463105eff7ee931d0a0f
Update to Mackay kernel settings

Change-Id: I1a41441849c8a99131f14d9f69aa8045daf0afc9
option to don't resore settings at boot

Change-Id: I2a4b2433c3c547d926ea70882a5438d0071672b1

Conflicts:

	AriesParts/res/xml/main.xml
	AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
	AriesParts/src/com/cyanogenmod/settings/device/Startup.java
Add some more Dutch translations

Change-Id: I3eebb522fabe455360242b1819e341c88915528a
better implementation of AromaFilemanager

Conflicts:

	device_base.mk

Change-Id: Ia2065a4ec282a995c57588dba79a121ce9150672
Add Led notification settings

Change-Id: Iee64e0c2a19759fa0db86a99bc104326c234555b
Disable Linaro building

Change-Id: I5cf60a00dea4268fc7833c8cced7b664933b9330
Revert "Disable Linaro building"

This reverts commit 4e2ae7626660cf6a1cf2c1d7f4e376d67579a02d.
Add recovery selection to AriesParts

Change-Id: I52c063cbe26db143fcb5bc29eb0903f2093cd86c
Revert "aries-common: use common recovery.rc"

This reverts commit c4fc13ab551167ddb3393e6cdf64045ecc54dab9.
Revert "better implementation of AromaFilemanager"

This reverts commit 48a440cadaec90304e7499f71d2925b5d4caed5b.
Improve translation for recovery selection

Change-Id: Iba8db495604c5f13cb5becacb20204690b3420ca
Add navbar option to Mackay Settings

Change-Id: I15466e4fb18112f94ba8a9f268c118614bf07d44
Add TouchWake to Mackay Settings

Change-Id: I1e80ea75e4b7850683c844c824eaa2292ac5ad99