calculator 250 dpi + 600p

Change-Id: Ib96b1c133ffc06baf3a9d26d31d1ab0d6c15ab77
Merge remote-tracking branch 'paranoid/jellybean' into jellybean
remove pa branches

Change-Id: I9ecfd9830ab84d46f9580de3fa1f9c83615b7c6e