| commit | f3c5a1b38c3a1c52577fe7c5bb969a298010fa46 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 16:57:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 16:57:47 2014 +0000 |
| tree | 05d70582f1e3af2111c6d1b98a5d81efad8f2176 | |
| parent | 82e55d6d731446293eb4b3ac77a20e9ccadbf67f [diff] | |
| parent | 4bcf39334ac871854afbf4f76137bbbe4175979e [diff] |
am 3009b4a6: (-s ours) am 85f10039: (-s ours) Import translations. DO NOT MERGE * commit '3009b4a6679dab952d9db3ed662126d59b3b9f1f': Import translations. DO NOT MERGE