| commit | 74b50520827e960cfbcd79d4523757599cbb3974 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 21:10:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 21:10:10 2014 +0000 |
| tree | bd35988e501803ae0a7d0448034a9172f8b1d393 | |
| parent | 8b480ca2b477dbffacce41a4e42f565a0645da02 [diff] | |
| parent | 4bfbb1fe7d991dad691738d28c749ad4b1a581b7 [diff] |
am 4ce0199e: (-s ours) am 8bf6bc2a: (-s ours) Import translations. DO NOT MERGE * commit '4ce0199eed2562c9025c009bbdda82e299a45e99': Import translations. DO NOT MERGE