| commit | f321d7307841c6759db026630a004233a4d71c4c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 15 13:45:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 15 13:45:33 2015 +0000 |
| tree | 92bc87048e9fcb349f4be1f22f69258b589467b5 | |
| parent | 7b449b9d28a722b0e2f2f3a44f515113ca52e08d [diff] | |
| parent | 4982f4f147c6b1b73173961397ca45b5cd846751 [diff] |
am cac777ed: (-s ours) am 3949d1e3: (-s ours) Import translations. DO NOT MERGE * commit 'cac777ed3036544360be313aedf09d3dc83ade6b': Import translations. DO NOT MERGE