| commit | 85c2b44f78817f0e2cbb1a7a837f9dd506365658 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 21 22:02:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 21 22:02:31 2015 +0000 |
| tree | f666fd76d64e1bbcf5583c8cbf85c78199a3146e | |
| parent | 700156b96b7287bfbf3b5905436afdcd2c56298f [diff] | |
| parent | 33b57087970e4b9f94599985da39003e2ce9cd60 [diff] |
am 33b57087: (-s ours) Import translations. DO NOT MERGE * commit '33b57087970e4b9f94599985da39003e2ce9cd60': Import translations. DO NOT MERGE