commit | 6356f0c3d1b621c0a45142dfe4f3e29aaf1316b5 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Sat Aug 01 16:54:43 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 16:54:43 2015 +0000 |
tree | 3705997856069c23496debcd96bb6e20fffdca0e | |
parent | be2ede2e7ee52fd82d299f79cb6be288f137740c [diff] | |
parent | 0aad14034911ee21c433b1aaa19a8f0703e3971d [diff] |
am 9bb9fc15: (-s ours) am 1480c09d: (-s ours) Import translations. DO NOT MERGE * commit '9bb9fc15570eb2b8461a814369f90c7d45372d74': Import translations. DO NOT MERGE