| commit | 7baf16a5ebc38fb9fdbd7a284dc9eaa2d19b15ae | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 17:13:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 17:13:16 2015 +0000 |
| tree | 8329ed171f3cbbbe423b892666a7ec4ec798d969 | |
| parent | 39b4414dd786878ef1215f62cc20d1a75b9f815c [diff] | |
| parent | d0cb0b90caea9e529c2126712b2cd9a56b61eb8f [diff] |
am d0cb0b90: (-s ours) am 23a7ba69: (-s ours) am 36b27180: (-s ours) am 26dfa3dd: (-s ours) Import translations. DO NOT MERGE * commit 'd0cb0b90caea9e529c2126712b2cd9a56b61eb8f': Import translations. DO NOT MERGE