Alternate default app picker (2/2)

Conflicts:
	res/values/strings.xml
	res/xml/interface_settings.xml
	src/com/android/settings/carbon/InterfaceSettings.java

Change-Id: I3fe189eaa812460372c587f025512c12175729db
Add lockscreen rotation as an optional rotation setting (2/2)

This will allow the user to select wether or not to use the
rotation settings for the lockscreen.  This is dependent
upon the rotation setting being checked.

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: If45c13a395e0d71b7c4cdcf484a6b8cef964ee37
JIRA: CYAN-339
Settings: PT-BR translations

Change-Id: Ic04c79170b4f19147a6b9768e229db09cbbd69bd
Port OnClick Fliptile animation.[2/2]

Change-Id: I2d4eca03565f0ea9a277beebc46e44f3a00c4f62

Conflicts:
	res/values/strings.xml
	res/xml/quicksettings_tiles_style.xml
	src/com/android/settings/cyanogenmod/quicksettings/QuickSettingsTilesStyle.java
merge changes from remotes/github/cm-10.1 into master