| commit | 22d50c34c70c2e8f770989ef5b24cbd9ad2d8366 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri May 29 22:14:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 29 22:14:29 2015 +0000 |
| tree | 96d0001c90275855086fd1c525f23df44e56c7a5 | |
| parent | d0cd336716cba7c8b8fb1ecd4f281daba4e7d67c [diff] | |
| parent | a67637817ab324ddd4c8c0b90284fd6342e81ef3 [diff] |
am a6763781: (-s ours) am b8fc0f57: (-s ours) Import translations. DO NOT MERGE * commit 'a67637817ab324ddd4c8c0b90284fd6342e81ef3': Import translations. DO NOT MERGE