fix tablet mode

Change-Id: I872dfdeadc90eca6f2cba42ecb68cff7c7652566
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0

Signed-off-by: OwnDroid <askowndroid@gmail.com>

Conflicts:
	src/com/android/calculator2/Calculator.java
	src/com/android/calculator2/CalculatorPadViewPager.java

Change-Id: I1178305185af31346e0811ba6d400a21d028889c