From: Geoff Mendal <mendal@google.com>
Date: Mon, 20 Oct 2014 23:49:08 +0000 (+0000)
Subject: am c25c92cc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
X-Git-Tag: android-x86-6.0-r1~671^2~400
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=69b9ca2914925d288609b2aaed3311923711a32b;p=android-x86%2Fpackages-apps-Settings.git

am c25c92cc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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

69b9ca2914925d288609b2aaed3311923711a32b