tree cfe8fda0e7e12bedbf9be36adeeaeb842b3d1a7b
parent 0f7fb97d67ecb22a1f1e766ee5b89b2800ed6696
parent ae4ed7caa392db84ec505bfecc7d40fa49659051
author Unsuk Jung <unsuk@google.com> 1403867487 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403867487 +0000

am ae4ed7ca: am 52150b5c: am 200eb0e4: am b3b66d20: am fd7e3061: am b8686114: am 61f6d18c: am 63d80895: am 697b9f58: am b8c2c78c: am c467ac37: am 06ff2f72: Merge "Fixes the issue with preview when ratio is 1:1" into jb-dev

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