| commit | 81ea35f89c39218e6828ba148969d2be9c5b88d3 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Jun 20 19:57:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 20 19:57:16 2014 +0000 |
| tree | 3010d53d92af3db24119116995f3c754c13f9196 | |
| parent | 48539dbf44898826967bf5afcf644c562e26fd0e [diff] | |
| parent | 4e16abf8d8d16196276dffc50e5df3f41c869024 [diff] |
am 4e16abf8: (-s ours) am f21eb597: (-s ours) Import translations. DO NOT MERGE * commit '4e16abf8d8d16196276dffc50e5df3f41c869024': Import translations. DO NOT MERGE