| commit | 4d4d95dd4dd42c557254131dc6e6df6bc6e2e805 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:22:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:22:25 2014 +0000 |
| tree | 7ba0d051a38199ccc70f000f25c80efb4647d5b2 | |
| parent | 098e46b3c7e1806458b89d0cdddd6a17227a0f73 [diff] | |
| parent | cbb7e965e307d71e0b981e44fa9b80db90c89226 [diff] |
am cbb7e965: (-s ours) am daf8ce56: (-s ours) Import translations. DO NOT MERGE * commit 'cbb7e965e307d71e0b981e44fa9b80db90c89226': Import translations. DO NOT MERGE