| commit | efc896e9cc57359936c2e0b9628613f70c8df600 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:22:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:22:29 2014 +0000 |
| tree | 0bb1c1d3fd10330f31aebdc179a45e550543175b | |
| parent | d4aeaef20b95855ac8067e66bd0ee9afe321b3a2 [diff] | |
| parent | 019b222d8e5a68c413fc040e7e7049f27a66f60a [diff] |
am 304cabd0: (-s ours) am 6fd7f435: (-s ours) am dd200258: (-s ours) Import translations. DO NOT MERGE * commit '304cabd03048369a8f6a1adca3748da8432293a2': Import translations. DO NOT MERGE