| commit | 0df85f81dcd49f3ad59985cbc0bed86e14640639 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 22:39:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 22:39:01 2014 +0000 |
| tree | f9eb3a48c6339f9cd744cd98fa184bb54a9244d6 | |
| parent | 32e45e6060959a1988664e2ae724475a66e707bb [diff] | |
| parent | f4ba3f4e87ae7384fb39c5219b29469c10c41506 [diff] |
am f4ba3f4e: (-s ours) am e93eb58e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'f4ba3f4e87ae7384fb39c5219b29469c10c41506': Import translations. DO NOT MERGE