AOSPxXx Initial Commit
Damn electron beam! Go away!!
Merge remote-tracking branch 'upstream/jellybean' into jellybean
Merge remote-tracking branch 'upstream/jellybean' into jellybean
Merge branch 'cm-10.1' of https://github.com/flappjaxxx/android_device_samsung_quincy-common into cm-10.1

Conflicts:
	overlay/packages/apps/Trebuchet/res/values/config.xml