| commit | 5b95c755821a966b411b164df18b928d2eda71f1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 19 16:59:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 16:59:27 2014 +0000 |
| tree | 4f1a4dcd4f6c8eee39bc5797e93ed667bc5f1452 | |
| parent | cfe34ebce6d2a6bd4f682d8f002b8318942ec30d [diff] | |
| parent | 9792edd17c777118f64a585272c9f11112cb22d7 [diff] |
am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE * commit '9792edd17c777118f64a585272c9f11112cb22d7': Import translations. DO NOT MERGE