From: Alan Newberger <alann@google.com>
Date: Wed, 30 Apr 2014 18:14:54 +0000 (+0000)
Subject: am 14fbb56f: (-s ours) am dd5fe0f1: am 1e8e8cec: am ccfafd95: Merge "Add Samsung... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~80
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=61be687bd68fd0a7e73a40d77997115345f17bce;p=android-x86%2Fpackages-apps-Camera2.git

am 14fbb56f: (-s ours) am dd5fe0f1: am 1e8e8cec: am ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad

* commit '14fbb56f1b148c2c9e1ca901b58e62bd271542e7':
---

61be687bd68fd0a7e73a40d77997115345f17bce