From: Andy Huibers <andyhuibers@google.com>
Date: Tue, 2 Sep 2014 21:13:12 +0000 (+0000)
Subject: am be020925: am 4cd2a6ab: am 5ca2e0b9: Merge "Remove android.hardware.camera2 import... 
X-Git-Tag: android-x86-6.0-r3~68^2~27^2~136^2~28
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4ee52d8e;p=android-x86%2Fpackages-apps-Camera2.git

am be020925: am 4cd2a6ab: am 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier

* commit 'be0209252151382e41c9033eb20e9abb0000cadd':
  Remove android.hardware.camera2 import from Settings3A.
---

4ee52d8e54343030ef79a80682101f4968dc75c5