From: Alan Newberger <alann@google.com>
Date: Fri, 1 Nov 2013 20:45:14 +0000 (-0700)
Subject: am dd5fe0f1: am 1e8e8cec: am ccfafd95: Merge "Add Samsung front camera resolutions... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~69
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=14fbb56f1b148c2c9e1ca901b58e62bd271542e7;p=android-x86%2Fpackages-apps-Camera2.git

am dd5fe0f1: am 1e8e8cec: am ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad

* commit 'dd5fe0f145e348365e6ca454f67ed969adbaec9e':
  Add Samsung front camera resolutions
---

14fbb56f1b148c2c9e1ca901b58e62bd271542e7