| commit | 28e21fb425aad90d4c76dcc618caf1cb5f0cf7ed | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Dec 26 23:44:08 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 26 23:44:08 2013 +0000 |
| tree | aa67c293d11ea696c3d73990507494267f01cbb7 | |
| parent | c3e5b034ca88360f98c1b60e48ab9640dbd271b9 [diff] | |
| parent | 4c60be5b135dd13556e947784f20f792c1f9d568 [diff] |
am 4c60be5b: (-s ours) am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '4c60be5b135dd13556e947784f20f792c1f9d568': Import translations. DO NOT MERGE