From: Geoff Mendal <mendal@google.com>
Date: Mon, 13 Jul 2015 23:37:30 +0000 (+0000)
Subject: am a06a903f: (-s ours) am 5d806912: (-s ours) am e27c079d: (-s ours) Import translati... 
X-Git-Tag: android-x86-7.1-r1~25^2^2~24^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3fa50c35c2d4f6cdcaaaa09e135a0f77be676c9b;p=android-x86%2Fpackages-apps-Camera2.git

am a06a903f: (-s ours) am 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE

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

3fa50c35c2d4f6cdcaaaa09e135a0f77be676c9b