| commit | da5490bae7aa3c261a60f631f54be8c65017af58 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:26:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:26:45 2014 +0000 |
| tree | 37744587460bcc220e4b368c93a844140cf53d02 | |
| parent | 0b76347efecd3e61651e424c1cd55c3e3146e148 [diff] | |
| parent | f160cab3fc5ef6ef5d04e17e8b3e66ee7e5af5a2 [diff] |
am f160cab3: (-s ours) am e0e64f53: (-s ours) am c3d9d48b: (-s ours) am e6f46829: (-s ours) Import translations. DO NOT MERGE * commit 'f160cab3fc5ef6ef5d04e17e8b3e66ee7e5af5a2': Import translations. DO NOT MERGE