From: Baligh Uddin <baligh@google.com>
Date: Tue, 16 Sep 2014 18:22:37 +0000 (+0000)
Subject: am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import... 
X-Git-Tag: android-x86-6.0-r1~1592
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=072f390b582a0d7bfffd5c9bb87e6f1dce7d9331;p=android-x86%2Fpackages-apps-Settings.git

am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

072f390b582a0d7bfffd5c9bb87e6f1dce7d9331