tree e87fe798744ddefa7857e0855742132b31632a3f
parent cd3b72e64f5564984ad3298df34af4ed042ec79a
parent c467ac37f213957acfb1ae1cd8e6335aed7bc6a8
author Unsuk Jung <unsuk@google.com> 1403863051 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403863051 +0000

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

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