tree a3aadd0257f1f6c1b74ca010ae471628965392d3
parent 40e89c1a43daf94ec6495d71c1f0b5933b6c9d47
parent 946609f0ea70e1361dbe979af0e054d4c18b929b
author Winson Chung <winsonc@google.com> 1438124091 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438124091 +0000

am 946609f0: Merge "Fixing overview mode scale calculations." into ub-launcher3-burnaby

* commit '946609f0ea70e1361dbe979af0e054d4c18b929b':
  Fixing overview mode scale calculations.