From: Geoff Mendal <mendal@google.com>
Date: Wed, 8 Jul 2015 13:31:14 +0000 (+0000)
Subject: am 03d7cde4: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-7.1-r1~25^2^2~33^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0a8c14f8b81dfb26ee11900c4ac5d0fae1f4a4f9;p=android-x86%2Fpackages-apps-Camera2.git

am 03d7cde4: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE

* commit '03d7cde4c5ba0eb4195b7b91266ef10c3e85a574':
  Import translations. DO NOT MERGE
---

0a8c14f8b81dfb26ee11900c4ac5d0fae1f4a4f9