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