From: Baligh Uddin <baligh@google.com>
Date: Fri, 19 Sep 2014 22:46:17 +0000 (+0000)
Subject: am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
X-Git-Tag: android-x86-6.0-r1~671^2~30^2~67^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3cf09bfe98ce0d8ebeb3dbb10f3408d086155607;p=android-x86%2Fpackages-apps-Settings.git

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

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

3cf09bfe98ce0d8ebeb3dbb10f3408d086155607