From: Baligh Uddin <baligh@google.com>
Date: Tue, 20 Oct 2015 01:30:31 +0000 (+0000)
Subject: am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=909bcceeb449284823d8fdbe4556f89b96577d75;p=android-x86%2Fpackages-apps-Trebuchet.git

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a19  -s ours am: bfe4347964  -s ours am: 669ef65afb  -s ours
am: 03937ac5d7  -s ours

* commit '03937ac5d7c2dae4d730bc6cea6d42c63ad13181':
---

909bcceeb449284823d8fdbe4556f89b96577d75