| commit | 0d4f1bc8e53a177d92cc6990db183571730daa3d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 28 15:47:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 28 15:47:44 2015 +0000 |
| tree | 585b14676ba7ed2423e4027a434f83d3d97ca386 | |
| parent | 68e8d6f1328397cda1f47ab72fc14bf630d3aff0 [diff] | |
| parent | b608c783fbad1d3fe49b9e98fbdc4e56666262ff [diff] |
am 47587815: (-s ours) am cf471a39: (-s ours) am 0666a43b: (-s ours) Import translations. DO NOT MERGE * commit '47587815962fe140913e6e2fde188bb441ab7732': Import translations. DO NOT MERGE