tree 98823b0ce5ac6bd5daceac03d4b1aee93a114f7a
parent c3770ac54e506ffb9173cbbfb2a4640817839df9
parent 163994c1d4206813f621bad04b808d08f753fb7d
author Mangesh Ghiware <mghiware@google.com> 1321545142 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321545142 -0800

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

* commit '163994c1d4206813f621bad04b808d08f753fb7d':
  Revert change to setInitialScale() to take display density into account.