| commit | d5a914f52c9842a31660f336cb39f27bcfc12fd4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 23 22:56:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:56:40 2015 +0000 |
| tree | 0ef436b6c00ff6b45845f49f395858d9cd93b00c | |
| parent | f21ef3d25af14ffaa8c1122b6a504fdf7b82b60f [diff] | |
| parent | 7163a0a1a68e464b00273e71851b56769aecaeb3 [diff] |
am 7163a0a1: (-s ours) am 57d7b5f4: (-s ours) am 1f9bad3c: (-s ours) Import translations. DO NOT MERGE * commit '7163a0a1a68e464b00273e71851b56769aecaeb3': Import translations. DO NOT MERGE