commit | 1cf6de761e463736855c010bf39d9de1ca80f9c7 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Nov 03 14:14:38 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 14:14:38 2014 +0000 |
tree | 0e4d40bcf5ac165e516c1a0d32aeb7a8160d3cdd | |
parent | c41cebe51bc75c8c8d13ff76f8af0ad382e63032 [diff] | |
parent | 4c9afd6ee05cb8c70e81abbbcae5c2ab372f6497 [diff] |
am 4c9afd6e: (-s ours) Import translations. DO NOT MERGE * commit '4c9afd6ee05cb8c70e81abbbcae5c2ab372f6497': Import translations. DO NOT MERGE