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

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

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

f7282d213ab2666471c2ffafe5e0e9c3dc144bbe