| commit | ca3cca9418ae73fe894a9ae980f3d4622e4505c3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 14 17:14:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 17:14:45 2015 +0000 |
| tree | d341b852a90648f8b06a7b2ae065c1be18dea800 | |
| parent | 5f551a0f1c791f6ed4566d600b09effe0fb3731d [diff] | |
| parent | 6a7bcb9128bd6663f3d82a7f8ddcfefdcf6a129b [diff] |
am 6a7bcb91: (-s ours) am f1d86ef7: (-s ours) am 7db61d06: (-s ours) am c362ec4b: (-s ours) Import translations. DO NOT MERGE * commit '6a7bcb9128bd6663f3d82a7f8ddcfefdcf6a129b': Import translations. DO NOT MERGE