From: Baligh Uddin <baligh@google.com>
Date: Tue, 20 Oct 2015 03:24:38 +0000 (+0000)
Subject: am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9c26a98ebf6052cd37c90a5abeb1df8d23158905;p=android-x86%2Fpackages-apps-Trebuchet.git

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours am: ed94b5520d  -s ours am: 3e1c84ad8c  -s ours am: 4c6f47c15e  -s ours
am: f4dd532c3e  -s ours

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

9c26a98ebf6052cd37c90a5abeb1df8d23158905