| commit | da4cd376ff3f04f4ad1fd4dd057b813f1cdcd497 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 29 23:34:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 23:34:57 2015 +0000 |
| tree | 0734c5bbd5a98ca48ca90bbb9b0c4cc22146e7b0 | |
| parent | 601488784571240aa2764adea74fa5a746c66513 [diff] | |
| parent | 0c44c2313e5be55733999d61aac34114599d6bc8 [diff] |
am 0c44c231: (-s ours) am 0497f6d3: (-s ours) Import translations. DO NOT MERGE * commit '0c44c2313e5be55733999d61aac34114599d6bc8': Import translations. DO NOT MERGE