am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take...
am 55116350: am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1
* commit '55116350':
Revert change to setInitialScale() to take display density into account.