| commit | f5f7944e5417b1e41c3321cdb48d6c884f9e3355 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Oct 28 07:13:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 07:13:47 2014 +0000 |
| tree | f38345d68a324670866c0ec66e16bdb7cef17ee5 | |
| parent | 94cd03279f79198b837cd7a2c279239fa6e61908 [diff] | |
| parent | 9d883f2e84d3fc721a45774f5efdafb9b7286dca [diff] |
am 9d883f2e: (-s ours) am aa62905b: (-s ours) am be25b245: (-s ours) Import translations. DO NOT MERGE * commit '9d883f2e84d3fc721a45774f5efdafb9b7286dca':