| commit | 4fe6117cc1ce411dbbcfc1b25dc1ef720901ad4b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 12 16:14:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 12 16:14:28 2015 +0000 |
| tree | 33683c28b1035bb597e7d2e0adbaf727c96cfffd | |
| parent | 04250824ff4d5231ee17a060a7ce77fcc02a6657 [diff] | |
| parent | 26310772872b327029cad560fa7b3e797b7980e9 [diff] |
am 26310772: (-s ours) Import translations. DO NOT MERGE * commit '26310772872b327029cad560fa7b3e797b7980e9': Import translations. DO NOT MERGE