| commit | 5e183ac6608eb5aca32a2a2835cd321217b451fb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 07 12:51:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 07 12:51:52 2015 +0000 |
| tree | 838e272e939b46eb3bcb26a7bda2db066a92cad0 | |
| parent | 7a3682ad1642ccd7a4fed32c633d8abeef9b8db3 [diff] | |
| parent | bd64cd59d6aace965dec9896a545572e16b456d6 [diff] |
am bd64cd59: (-s ours) am 35d2cf1c: (-s ours) am b4a027d0: (-s ours) Import translations. DO NOT MERGE * commit 'bd64cd59d6aace965dec9896a545572e16b456d6': Import translations. DO NOT MERGE