From: Geoff Mendal <mendal@google.com>
Date: Tue, 14 Jul 2015 22:04:15 +0000 (+0000)
Subject: am 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9... 
X-Git-Tag: android-x86-7.1-r1~25^2^2~17
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc185a9b6493f5eacf69eb7a981c124b96352e78;p=android-x86%2Fpackages-apps-Camera2.git

am 6bee46a1: (-s ours) am ec281039: (-s ours) am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE

* commit '6bee46a1b4cbfc420d9c020bbab3d7821de7acbe':
  Import translations. DO NOT MERGE
---

dc185a9b6493f5eacf69eb7a981c124b96352e78