| commit | d4aeaef20b95855ac8067e66bd0ee9afe321b3a2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:22:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:22:28 2014 +0000 |
| tree | 0bb1c1d3fd10330f31aebdc179a45e550543175b | |
| parent | 1d1f1c0177640cebd8065cde1a65af7c55674412 [diff] | |
| parent | 2bcb9879125d33ec596e78edf0441f7f0a53a91e [diff] |
am 81d32c84: (-s ours) am 11766d3d: (-s ours) Import translations. DO NOT MERGE * commit '81d32c842df55ef81cf8b4b3879f634ed089c114': Import translations. DO NOT MERGE