| commit | 11d84f01773a8ec2a10ec9a1dd74d6c5c7856988 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 08 19:42:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 19:42:59 2014 +0000 |
| tree | cb9b38f4ec6b5fc5db5a777afba704e34280cddd | |
| parent | fb5729793892c32667a318c35716f0f4d4b6ffb0 [diff] | |
| parent | c94a7ce5e1995888f6de82d567e066396a3a26a1 [diff] |
am c94a7ce5: (-s ours) am ff0faf82: (-s ours) Import translations. DO NOT MERGE * commit 'c94a7ce5e1995888f6de82d567e066396a3a26a1': Import translations. DO NOT MERGE