| commit | 7f54d3df52ea40bf6b34fa911d283502eacd1061 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 26 23:01:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 26 23:01:24 2015 +0000 |
| tree | 9a372beaf26a6886120985f9ef6af06638c523a6 | |
| parent | ef8af92bf268617f026fc32e356e735cd5b6b2dc [diff] | |
| parent | 404e707cda0dd9bece38a3315e0d13e2e09bd152 [diff] |
am 404e707c: (-s ours) am 7f4a1da1: (-s ours) Import translations. DO NOT MERGE * commit '404e707cda0dd9bece38a3315e0d13e2e09bd152': Import translations. DO NOT MERGE