From: Geoff Mendal <mendal@google.com>
Date: Wed, 15 Jul 2015 14:02:38 +0000 (+0000)
Subject: am a95faf78: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r3~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=13688c8b7e84a2ff8017c33db35559b5d0fb878a;p=android-x86%2Fpackages-apps-Camera2.git

am a95faf78: (-s ours) Import translations. DO NOT MERGE

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

13688c8b7e84a2ff8017c33db35559b5d0fb878a