| commit | 05efa1c33d61e3bd34190962788beca88c94fc48 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 19:41:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 19:41:04 2015 +0000 |
| tree | 75a24d64a2e2378a0486df3633166939fb51dce0 | |
| parent | a8aaf70c7e52e333cc94d4afcdd86aca97732efe [diff] | |
| parent | 090d970a9153b34b601f2529cc5f0a9c21c97254 [diff] |
am 090d970a: (-s ours) am 9d5f3cf2: (-s ours) Import translations. DO NOT MERGE * commit '090d970a9153b34b601f2529cc5f0a9c21c97254': Import translations. DO NOT MERGE