| commit | daf2f8332cf3b142a50d9e16f1c6f807afe02171 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed May 13 15:23:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 13 15:23:17 2015 +0000 |
| tree | bdd2d1316de05a792e8742a0ebfed59ec8604235 | |
| parent | 141f94b6718a87b27bf4fd334cea11232b965ecf [diff] | |
| parent | cd32235520aa7ec162c774e9f9feb61e2f5ce520 [diff] |
am cd322355: (-s ours) am e4aa1150: (-s ours) Import translations. DO NOT MERGE * commit 'cd32235520aa7ec162c774e9f9feb61e2f5ce520': Import translations. DO NOT MERGE