| commit | 7227ca7f1b7f4167cb6aa7f1d02748dbd7dc1bcc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Nov 13 02:12:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 13 02:12:40 2014 +0000 |
| tree | f665b3da1b8f77acaabc4739c8cc5e15aa117402 | |
| parent | 4b5b0ab85ebeeefeb35cd0f9897c7bfeca91b419 [diff] | |
| parent | 50e61bee5ac52f7e63d018c13115240f6fc4af11 [diff] |
am 50e61bee: (-s ours) am 3bf6d4a5: (-s ours) Import translations. DO NOT MERGE * commit '50e61bee5ac52f7e63d018c13115240f6fc4af11': Import translations. DO NOT MERGE