| commit | f57d4069a170d4f4a9ad2f0f9021cd80bc071db5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu May 14 06:39:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 06:39:18 2015 +0000 |
| tree | 9105cec012ebfc12c7252ad56d743756ab9e30ef | |
| parent | 3e69fb7bfef4852fd13104a35b543bc604bcbb89 [diff] | |
| parent | a63a83b18fb3341d9f71717adc0e03e925a8a122 [diff] |
am a63a83b1: (-s ours) am 99edf29a: (-s ours) Import translations. DO NOT MERGE * commit 'a63a83b18fb3341d9f71717adc0e03e925a8a122': Import translations. DO NOT MERGE