| commit | da029217c891e989a569f327487b3db7ea7b0d81 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 28 15:36:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 15:36:25 2015 +0000 |
| tree | 77794718715e5b2fb4053008393d5ae9795bcfea | |
| parent | 617af27167d4d943043761414709e115e74c55fa [diff] | |
| parent | a4293a9b91a41c80e3af255da3cee22f6cb974d9 [diff] |
am a4293a9b: (-s ours) am 7608492d: (-s ours) Import translations. DO NOT MERGE * commit 'a4293a9b91a41c80e3af255da3cee22f6cb974d9': Import translations. DO NOT MERGE