| commit | 4ff93c42e862ec08c845ee5d521a81bd4c5d6dec | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 12 14:14:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 14:14:47 2015 +0000 |
| tree | 13f6e71bd5dcabe7161ffc68f9ef8b5b980318f7 | |
| parent | 1e3e3e0481c1f36b6c5b890954bfd7faab09f8d4 [diff] | |
| parent | cdf0456e5eeba46df043115420ebad377bff1772 [diff] |
am 3dc03977: (-s ours) am 61061cb2: (-s ours) am f36b5e64: (-s ours) am b54fb505: (-s ours) Import translations. DO NOT MERGE * commit '3dc039775c9f91836f0078b547ae4551a7ed637b': Import translations. DO NOT MERGE