tree f1a8326ee497ed76ef40c9e816cf69f7f3e206e6
parent bbc676ba06b2a692217288ea3175c10cc4b4c7a2
parent 9b61ca542aca24a9b09bd6b6bb5afb60d1689710
author Alice Yang <alice@google.com> 1378242758 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1378242758 +0000

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