From: Baligh Uddin <baligh@google.com>
Date: Sat, 5 Oct 2013 04:08:40 +0000 (+0000)
Subject: Merge "Build broken." into klp-dev
X-Git-Tag: android-x86-6.0-r3~1684^2~44^2~57
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e5b45eaf;p=android-x86%2Fpackages-apps-Camera2.git

Merge "Build broken." into klp-dev
---

e5b45eafa6c19865045c5c867399ea4bbb692638