| commit | 6df87bc9b62ad397a32e761732d3280086ff4831 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 16:38:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 16:38:42 2015 +0000 |
| tree | 54650e0e7fe52ca077756e08f3d1930934cff7e0 | |
| parent | c5a24c38acfe7243f296622f781a8115ce49bd77 [diff] | |
| parent | d6d398e64107aa52b7612f887e0bd78e54660ae7 [diff] |
am d6d398e6: (-s ours) Import translations. DO NOT MERGE * commit 'd6d398e64107aa52b7612f887e0bd78e54660ae7': Import translations. DO NOT MERGE