| commit | 2c72f0343f48ba3cc403c0c474030e4e81503d23 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 12 14:01:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 14:01:21 2015 +0000 |
| tree | fd7bf825d1344c8906396caaada0a54bb624fdfc | |
| parent | a237f4808bdca9f4fa8b475af3e9282e4faabb70 [diff] | |
| parent | 3682b35efec9f62a605b8c3ed708b4f13dc914e2 [diff] |
am f36b5e64: (-s ours) am b54fb505: (-s ours) Import translations. DO NOT MERGE * commit 'f36b5e6419b5b9a2c2254e8de7b8155478d0bc0b': Import translations. DO NOT MERGE