calculator 250 dpi + 600p

Change-Id: Ib96b1c133ffc06baf3a9d26d31d1ab0d6c15ab77
Merge remote-tracking branch 'upstream/jellybean' into HEAD