| commit | 58ae133a9baf4181c8ec85d234d078257803af89 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:39:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:39:46 2014 +0000 |
| tree | 52fb6bd0ffbe38f8d561c34f8d4738ff374368fe | |
| parent | 4eca5bf20056f63c30881e7114970840be6fb36e [diff] | |
| parent | ef6c6c6f01cf674d9152e2eb3a027d588412fd24 [diff] |
am ef6c6c6f: (-s ours) am fd052e05: (-s ours) Import translations. DO NOT MERGE * commit 'ef6c6c6f01cf674d9152e2eb3a027d588412fd24': Import translations. DO NOT MERGE