| commit | 4f48b435cefa07d722225d74eccfafc0c0091ba8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 24 14:13:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 14:13:18 2015 +0000 |
| tree | c759e7e79e961d3c4fa4f4ea6ba08909b39dcdcb | |
| parent | f7ed99e6bc20f4692b0564b3eb18b1de2cd47129 [diff] | |
| parent | e042f952b3dd82fb38749c282e9273c8dc8326df [diff] |
am e042f952: (-s ours) Import translations. DO NOT MERGE * commit 'e042f952b3dd82fb38749c282e9273c8dc8326df': Import translations. DO NOT MERGE