| commit | 1c3b56b2541bf137d84f1616c678239108c4fcf7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:23 2015 +0000 |
| tree | b067349907727725c27032cee0f2b43437e4a9d6 | |
| parent | 321bdf20935da07ca472ec90cdf1a55a6f9842ac [diff] | |
| parent | 48761b9d3b71b499f8640406eb02a62133cd4dc4 [diff] |
am 48761b9d: (-s ours) am 7be0aed6: (-s ours) Import translations. DO NOT MERGE * commit '48761b9d3b71b499f8640406eb02a62133cd4dc4': Import translations. DO NOT MERGE