tree 94f6880654aa54a01207dad91c5bd38d03371333
parent a219d97d66b31d53f559e12b73924335349f88d8
parent c77916eef7fadeca762e2c95752d61faea7d66b9
author Alice Yang <alice@google.com> 1378279829 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378279829 -0700

am c77916ee: Merge "Revert "Revert "always set the initial-scale""" into jb-ub-mail-ur10

* commit 'c77916eef7fadeca762e2c95752d61faea7d66b9':
  Revert "Revert "always set the initial-scale""