| commit | dc00e58048a854e87f7285fc8db14451de8db684 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:39:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:39:55 2014 +0000 |
| tree | e2fa2d413c1bfeba1ae999987add0cfc55fab137 | |
| parent | f160cab3fc5ef6ef5d04e17e8b3e66ee7e5af5a2 [diff] | |
| parent | b338323ea4a88649f5562e7ec44fa6f1d2e9c300 [diff] |
am b338323e: (-s ours) am 41c5801e: (-s ours) am ee8cbc45: (-s ours) am 36eb99ef: (-s ours) Import translations. DO NOT MERGE * commit 'b338323ea4a88649f5562e7ec44fa6f1d2e9c300': Import translations. DO NOT MERGE