| commit | ab183510ce4ed4538d5bbbbfba512db240b32f27 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 20 15:20:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 20 15:20:51 2015 +0000 |
| tree | 6c73eda091ad589be02aa9477b5fcb0042ea7b22 | |
| parent | eb550f1a30c51a46835ea19c9247b291febc8a2f [diff] | |
| parent | 0f85529f89b094518057e07e74acdd66972fe03e [diff] |
am 0f85529f: (-s ours) am 4cd88420: (-s ours) am 692f3a96: (-s ours) am 61f048a4: (-s ours) Import translations. DO NOT MERGE * commit '0f85529f89b094518057e07e74acdd66972fe03e': Import translations. DO NOT MERGE