tree e4bae883f9d7403845884db9292230fe3ad09bb5
parent 25a33156770094e7152a39b977a01866b7377473
parent b8c2c78c1371b4561b33f356ae22244282eba275
author Unsuk Jung <unsuk@google.com> 1403863364 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403863364 +0000

am b8c2c78c: am c467ac37: am 06ff2f72: Merge "Fixes the issue with preview when ratio is 1:1" into jb-dev

* commit 'b8c2c78c1371b4561b33f356ae22244282eba275':
  Fixes the issue with preview when ratio is 1:1