From: Doris Liu <tianliu@google.com>
Date: Sat, 17 Aug 2013 01:03:17 +0000 (-0700)
Subject: am c5541a55: am e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~359
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=957da61b;p=android-x86%2Fpackages-apps-Camera2.git

am c5541a55: am e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad

* commit 'c5541a555c185a3ea665003eb085f7778028412e':
  Add image 1:1 support
---

957da61b9229361723f5df310e758033131519f5