| commit | e477510104f7a31650974b827bab3ebdaf7b5427 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 20:20:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 20:20:39 2014 +0000 |
| tree | f439482e80559f310178bb050de770ca86fb0b23 | |
| parent | 961a5836314cfb18c20002dd46d7c31776d9ce03 [diff] | |
| parent | e8e6b933a73f7ff23bd6c0880cc6d9b82bd4ec9e [diff] |
am e8e6b933: (-s ours) am c81a3e16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'e8e6b933a73f7ff23bd6c0880cc6d9b82bd4ec9e': Import translations. DO NOT MERGE