| commit | 5698a2525b22bb7211de903e52600d1407d40235 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 18:17:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:17:24 2015 +0000 |
| tree | 8c0d0aefdd38c8aad4743742f59c2eb8d7ac6b25 | |
| parent | 0aab5bfd50588f21eab89aa48aec922ce76c6c53 [diff] | |
| parent | fddbd8f95835c232ae8fa17a50a04fcdab8d2ee9 [diff] |
am fddbd8f9: (-s ours) am 4a366426: (-s ours) am ab87b786: (-s ours) Import translations. DO NOT MERGE * commit 'fddbd8f95835c232ae8fa17a50a04fcdab8d2ee9': Import translations. DO NOT MERGE