| commit | 583f07e9b752b3fd025ad5975fc20cad8cd3d148 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Feb 27 16:41:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 27 16:41:52 2015 +0000 |
| tree | a46729815601e4e689f332011f0e14faf90c571c | |
| parent | 2c5d427d9b846bd1ddffa89a9337a23249bbf378 [diff] | |
| parent | 20b3fd14846a55d59a8d98906ea8557f01e2fd89 [diff] |
am 20b3fd14: (-s ours) am 04a0ff18: (-s ours) Import translations. DO NOT MERGE * commit '20b3fd14846a55d59a8d98906ea8557f01e2fd89': Import translations. DO NOT MERGE