| commit | 32a9a993f74c962858591b0d2293edddb37d1b43 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 14:16:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 14:16:17 2015 +0000 |
| tree | 944b7755c7c59801e7f8e414084cc83bd6b1889a | |
| parent | 9d95d88442babaa3511d28d89e05a244b97a7bdf [diff] | |
| parent | 4c60755b310dfb54a1eb748fe184f6e928295b3d [diff] |
am 4c60755b: (-s ours) am f3907176: (-s ours) Import translations. DO NOT MERGE * commit '4c60755b310dfb54a1eb748fe184f6e928295b3d': Import translations. DO NOT MERGE