| commit | 6016cf6ae355fa7652759acf7e530c25052d9219 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 23 20:45:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 20:45:07 2014 +0000 |
| tree | f2d730ff60cb742095a546856977ab8d8c18d602 | |
| parent | 97b1f959fd35ddb4a9104f3800940194e7156820 [diff] | |
| parent | 6ad0404d0661a0f5b9b0e385b8cb3aa281fa041a [diff] |
am 6ad0404d: (-s ours) Import translations. DO NOT MERGE * commit '6ad0404d0661a0f5b9b0e385b8cb3aa281fa041a': Import translations. DO NOT MERGE