| commit | 48a0b5a4abd6c265491c6bdd8e653508da434cfb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 16:49:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 16:49:54 2015 +0000 |
| tree | 6b669457612cdaa066403d75e4b3c04437fb3088 | |
| parent | e614ec1ad74f28cf1cb95752988a5aa7fefb3eb1 [diff] | |
| parent | c252656475260ca9dae008c9e7904ccf023db49c [diff] |
am c2526564: (-s ours) am 00e52d7b: (-s ours) Import translations. DO NOT MERGE * commit 'c252656475260ca9dae008c9e7904ccf023db49c': Import translations. DO NOT MERGE