commit | 38d97b5eb80c5e5b0186aca6b31dcaf01cceda45 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Fri Feb 14 21:02:35 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 21:02:35 2014 +0000 |
tree | b9221af250cffb377475a64263ff9a9a5f4379e1 | |
parent | f3755533722055806da43e06335128a7cf48b758 [diff] | |
parent | cd0f6e0cd5ab3271897064b28cecc50c0a481ca8 [diff] |
am cd0f6e0c: (-s ours) am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit * commit 'cd0f6e0cd5ab3271897064b28cecc50c0a481ca8': Import translations. DO NOT MERGE