Merge "Change back the scaling calculation."
authorYaowu Xu <yaowu@google.com>
Tue, 25 Mar 2014 16:48:21 +0000 (09:48 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 25 Mar 2014 16:48:21 +0000 (09:48 -0700)
commit59872069d249ddf1d6efdee124a3cfcfc8596cac
tree78fa6341099f6cdc83c0518e9df004517db311ef
parent17e9df144113eef80e76ce4fb66b0e3ddf23db82
parent22232ec6024a9ccb2ec3bebc7664a723e3e99566
Merge "Change back the scaling calculation."