| commit | a1b06c5df88edd2ce8ad74d44346266e59801758 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 03 14:27:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 14:27:43 2014 +0000 |
| tree | 0988e25738a1b044800aa6f1c31d6e2ac3d1c7c1 | |
| parent | 0f44f619ec5eb83223d7fa23cd728006f727d8ca [diff] | |
| parent | b97ee5422c5b22530e1111b05be4263c3775a5b3 [diff] |
am b97ee542: (-s ours) am 1cf6de76: (-s ours) am 4c9afd6e: (-s ours) Import translations. DO NOT MERGE * commit 'b97ee5422c5b22530e1111b05be4263c3775a5b3': Import translations. DO NOT MERGE