| commit | 3f1a9a5a577bc6284a5c0b0416b0df4f658c5ddd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:31 2015 +0000 |
| tree | 8c2e9bc1ed8c18a825a994bbc16e16e4d0b55adb | |
| parent | 1066a9977c641c678418771f398edadb80c33da8 [diff] | |
| parent | 83226b91d7b2301df23dc136fecd0410fdd58162 [diff] |
am 83226b91: (-s ours) am 96cf989a: (-s ours) Import translations. DO NOT MERGE * commit '83226b91d7b2301df23dc136fecd0410fdd58162': Import translations. DO NOT MERGE