From: Geoff Mendal <mendal@google.com>
Date: Thu, 16 Oct 2014 00:57:10 +0000 (+0000)
Subject: am 78c00239: (-s ours) am 628d83e7: (-s ours) Merge "Import translations. DO NOT... 
X-Git-Tag: android-x86-6.0-r1~671^2~420
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=20ef7a70c48967a1a1d6aef8ad81787e1620558b;p=android-x86%2Fpackages-apps-Settings.git

am 78c00239: (-s ours) am 628d83e7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '78c00239df6d858c19a8243ad41ba96967e2fddc':
  Import translations. DO NOT MERGE
---

20ef7a70c48967a1a1d6aef8ad81787e1620558b