| commit | 49871b5073cde1d8775ff876a65b38c8ccd9b145 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 06 15:47:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 15:47:46 2015 +0000 |
| tree | c1ee11e8a383d8de9a4b4b4332660cd55a4e408e | |
| parent | e78edc6423fdc46dc85d79d5416505ba55be02f1 [diff] | |
| parent | 0dd06fd5e907075f26ecf07ee89a3dbcda4b47d2 [diff] |
am 0dd06fd5: (-s ours) am 1e0ecf87: (-s ours) am 99f71e0f: (-s ours) am 0356bca6: (-s ours) Import translations. DO NOT MERGE * commit '0dd06fd5e907075f26ecf07ee89a3dbcda4b47d2': Import translations. DO NOT MERGE