From: Geoff Mendal <mendal@google.com>
Date: Thu, 27 Aug 2015 14:40:40 +0000 (+0000)
Subject: am 6a49f18d: (-s ours) am 55db89fb: (-s ours) am 57b4d24e: (-s ours) am 09364eeb... 
X-Git-Tag: android-x86-7.1-r1~69
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=29126d875a1a614441c2dfeab1a882dd389634c2;p=android-x86%2Fpackages-apps-Camera2.git

am 6a49f18d: (-s ours) am 55db89fb: (-s ours) am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE

* commit '6a49f18dafd829d0de18030371af5e7fb47150d4':
---

29126d875a1a614441c2dfeab1a882dd389634c2