From: Alan Newberger <alann@google.com>
Date: Fri, 19 Sep 2014 21:14:46 +0000 (+0000)
Subject: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera... 
X-Git-Tag: android-x86-7.1-r1~25^2~45^2~3^2~31^2~3
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=2aa7189d020e5fc63fb626ae8a932f6e19c87a8d;p=android-x86%2Fpackages-apps-Camera2.git

am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier

* commit '40b52050078c664295b7bb830110587e64119bbb':
  Fix CameraSettingsActivityHelper
---

2aa7189d020e5fc63fb626ae8a932f6e19c87a8d