| commit | 7b21fc5bd61489b404fc0eb8cdd57e2368d33fa2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:49:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:49:03 2015 +0000 |
| tree | a75be3fffb5383cd8a5b75e920a41da1ce73fc16 | |
| parent | e3735d91b42cd2b49385a712055ccfdabae259cb [diff] | |
| parent | a7effd1d40fb93f92fcd89374c24b34ed90bdf83 [diff] |
am a7effd1d: (-s ours) am 983dcbd1: (-s ours) am cc34158a: (-s ours) am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE * commit 'a7effd1d40fb93f92fcd89374c24b34ed90bdf83': Import translations. DO NOT MERGE