| commit | 656fea968ef03af9e9505d9d010a787a261d333f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:25:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:25:33 2015 +0000 |
| tree | 35bb7fb721b11264c812f8e975b51ebc854b5fe9 | |
| parent | 6097c0cb456cd8acc9f3945d5686a5faad9a57b6 [diff] | |
| parent | 8d514d852d1cf48f1dfadb2acc677b30e5b1cecb [diff] |
am 8d514d85: (-s ours) am 9a9367fb: (-s ours) Import translations. DO NOT MERGE * commit '8d514d852d1cf48f1dfadb2acc677b30e5b1cecb': Import translations. DO NOT MERGE