From: Geoff Mendal <mendal@google.com>
Date: Tue, 14 Jul 2015 22:05:51 +0000 (+0000)
Subject: am cf38f8a7: (-s ours) am 04312d09: (-s ours) am 15579b8d: (-s ours) am 4e3575eb... 
X-Git-Tag: android-x86-7.1-r1~25^2~53
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=260efe3d;p=android-x86%2Fpackages-apps-Camera2.git

am cf38f8a7: (-s ours) am 04312d09: (-s ours) am 15579b8d: (-s ours) am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE

* commit 'cf38f8a7b5d9784276f5a7e9c3d047651ddde624':
  Import translations. DO NOT MERGE
---

260efe3d2636c357a9425bb31366b1b6162fc903