| commit | c35e9620edd2a214185ecd208ae58ee3a18d4678 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 03 15:12:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 15:12:00 2014 +0000 |
| tree | 616dd6786d1439cb62ef8c2b48fbaa88523dafa1 | |
| parent | 8af07f4717359c8421bc91c8171fcf749714b08f [diff] | |
| parent | dde49a4fe8ae9a4736d171efbadb067e7d4cc81d [diff] |
am dde49a4f: (-s ours) am c95236de: (-s ours) Import translations. DO NOT MERGE * commit 'dde49a4fe8ae9a4736d171efbadb067e7d4cc81d': Import translations. DO NOT MERGE