commit | 3782fe0a88f8ba98a8c7b6c2ce6cbb4204325033 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 08 19:06:45 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 19:06:45 2015 +0000 |
tree | 210189ffcc165ad72a40bb7a20a2326f13e863c8 | |
parent | 53dac3c9754630730ec91c2582258001f26c11cf [diff] | |
parent | 589c0c2622d4279ba1926e4ff702ad8ea35ad324 [diff] |
am 589c0c26: (-s ours) am 4356e281: (-s ours) Import translations. DO NOT MERGE * commit '589c0c2622d4279ba1926e4ff702ad8ea35ad324': Import translations. DO NOT MERGE