From: Geoff Mendal <mendal@google.com>
Date: Mon, 22 Jun 2015 15:38:50 +0000 (+0000)
Subject: am e4841b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
X-Git-Tag: android-x86-7.1-r1~1317^2~356
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cb35e5a718f8c716dc476d13ad0f39c1815f87d0;p=android-x86%2Fpackages-apps-Settings.git

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

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

cb35e5a718f8c716dc476d13ad0f39c1815f87d0