From: Seth Raphael <magicseth@google.com>
Date: Mon, 12 May 2014 22:12:42 +0000 (+0000)
Subject: am d63b0fce: Merge "Add new string for describing resolutions." into ub-camera-everglades
X-Git-Tag: android-x86-6.0-r3~1009
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=12ae68136c9dd0d58dedaa5e436e52160d9093a6;p=android-x86%2Fpackages-apps-Camera2.git

am d63b0fce: Merge "Add new string for describing resolutions." into ub-camera-everglades

* commit 'd63b0fce3b8bb993dba76c08a53d923b25f853ff':
  Add new string for describing resolutions.
---

12ae68136c9dd0d58dedaa5e436e52160d9093a6