| commit | 6a480ae0d2498b84574102150d7683ab955f5de0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Sep 20 05:16:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 20 05:16:06 2014 +0000 |
| tree | a35d421f0bb7cdb678adf3ac5f7a2c3fc56b0071 | |
| parent | eb0751c60e7c27f20ae75c997129a1d319e64ab1 [diff] | |
| parent | c62eef50f968a481990d3aa76ee877d4af5dd007 [diff] |
am c62eef50: (-s ours) am b73ca6ed: (-s ours) am 14340101: (-s ours) am 7da76789: (-s ours) am be132cca: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c62eef50f968a481990d3aa76ee877d4af5dd007': Import translations. DO NOT MERGE