| commit | e1ea5a5c8e4ed8b327603958492778550059664a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 17 14:31:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 14:31:17 2014 +0000 |
| tree | 19c9e17c3de2e599b1b47afd051469d88a5c0562 | |
| parent | c0ecaeefe8d22c8dbd77c51090cb55e1c448b983 [diff] | |
| parent | b4ff026930c1578cb8d6644a40169946758b70ce [diff] |
am b4ff0269: (-s ours) am 3b08bdec: (-s ours) Import translations. DO NOT MERGE * commit 'b4ff026930c1578cb8d6644a40169946758b70ce': Import translations. DO NOT MERGE