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