commit | fbc571bf34f352644636e58fee7d9cb80a41a3b2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed May 27 14:16:58 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 27 14:16:58 2015 +0000 |
tree | 3e7b9e07b88681d5a3d5bfd7af6c4d02eb783720 | |
parent | 7e82db90b75dea894a45961c801444a40c668f5b [diff] | |
parent | 37f1a648f8c89b128cd9c277ea98a73118e5733b [diff] |
am 37f1a648: (-s ours) am 4a11fe37: (-s ours) am 0d70f70a: (-s ours) Import translations. DO NOT MERGE * commit '37f1a648f8c89b128cd9c277ea98a73118e5733b': Import translations. DO NOT MERGE