Merge branch 'cyanogenmod' into cm-10.2
Merge branch 'cyanogenmod' into cm-10.2
Change default to show grid size option for tablets

Change-Id: Ib5be43385a3e58ebeda8d2185d7e582f317bd773
Allow larger grid for 720p

Change-Id: I7e7b81cc3d2f0ec5e83cb6b98e61757374878079
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge branch 'cyanogenmod' into cm-10.2
Option to disable workspace background shading

Change-Id: Ie35ee23a66a930f3992341a5ac5101fa065d3e8b
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Allow compilation on cm

Change-Id: I1e3d5b558a8056d5b1d283293973f147e625dfc3
Trebuchet : Fix dynamic padding

Improves dynamic padding based on cellcount / screen size.

Change-Id: Ib1c9419a39ea2b3a62be9564373a713a411cb1cf
Use onBackPressed for drawer

Change-Id: I3f74895784a2eea6344fef5b8a2fd514d097e327
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	res/values/cm_strings.xml

Change-Id: I55779b21e9e76acebff3f82ff2667fd258658b47
Merge "Trebuchet : Fix dynamic padding" into cm-10.2