| commit | f221299b2253d941ca39f0f4cb3a09b6a5508962 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 16:39:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 16:39:02 2015 +0000 |
| tree | 7d07195c5840bfa3ca1ff9d22e8731531ca54536 | |
| parent | 94491f6c44c9110bbf256c36a9dd9b1a4a426525 [diff] | |
| parent | d6d398e64107aa52b7612f887e0bd78e54660ae7 [diff] |
am d6d398e6: (-s ours) Import translations. DO NOT MERGE * commit 'd6d398e64107aa52b7612f887e0bd78e54660ae7': Import translations. DO NOT MERGE