galaxys2: volume rocker wake

Change-Id: I8ebb0c76e0a96caa0b9f8d959cc2718c7bfd833c
galaxys2: camera: add missing picture size

Change-Id: I2b7d06f42a6020bc8bbe6718bedbd74ebe706636
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD

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

Change-Id: I4e71b86481f3a197e53a1ab956864c4878e96113