From: Geoff Mendal <mendal@google.com>
Date: Wed, 15 Jul 2015 14:24:58 +0000 (+0000)
Subject: am 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-7.1-r1~25^2^2~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4c875ca0;p=android-x86%2Fpackages-apps-Camera2.git

am 9ef51ffc: (-s ours) am d8296c0e: (-s ours) Import translations. DO NOT MERGE

* commit '9ef51ffc17e2cdfe21311a89558c31633e3c1d6d':
  Import translations. DO NOT MERGE
---

4c875ca0f83fed0355b238c74440f78d81fa04ae