| commit | 700b0d75490c51638493bcf2a7dd574f0863c8c3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu May 14 10:13:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 10:13:17 2015 +0000 |
| tree | c60c7c773df3a9e5752a0a17825571da34a3cb9d | |
| parent | 11b848bb4a497f89a5bb21ecb2f2f0dc86e5d703 [diff] | |
| parent | dde4f6841df417d0f584e773c5662aee4bf6fb68 [diff] |
am dde4f684: (-s ours) am 28791f9d: (-s ours) Import translations. DO NOT MERGE * commit 'dde4f6841df417d0f584e773c5662aee4bf6fb68': Import translations. DO NOT MERGE