| commit | 70ca047b61c72f1670d52d16d8d0deb341277f38 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:47:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:47:50 2015 +0000 |
| tree | 65b799326396e5d726e2d036990a9e840917be3a | |
| parent | 1c748a8000b93b034b3819ebdbd2aef09f8b3a58 [diff] | |
| parent | eaefbdc5e40db01c451c0c59e1febf9967331773 [diff] |
am eaefbdc5: (-s ours) am 32588bc1: (-s ours) Import translations. DO NOT MERGE * commit 'eaefbdc5e40db01c451c0c59e1febf9967331773': Import translations. DO NOT MERGE