| commit | fa2346325615371139943d3ea1be12410b917965 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:27 2015 +0000 |
| tree | d62b78cd7493659e0118f436eb7326d3cf86a38e | |
| parent | fce5cefa29ee61343d5d626714afabe9408e9c60 [diff] | |
| parent | daf0cbb2fd0782f9f45923bdb889325c3ea8b130 [diff] |
am daf0cbb2: (-s ours) am 432f67c4: (-s ours) am d28d46e3: (-s ours) am 22c0a189: (-s ours) Import translations. DO NOT MERGE * commit 'daf0cbb2fd0782f9f45923bdb889325c3ea8b130': Import translations. DO NOT MERGE