| commit | 4bcf39334ac871854afbf4f76137bbbe4175979e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 16:53:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 16:53:09 2014 +0000 |
| tree | 78f391a3728f560d25404f8c9f8be4595fea6d9c | |
| parent | 6cce546dd301d747e2837468729c71a63823ca8b [diff] | |
| parent | 4ce7830d91bb2c3964b5b4f0bc692e32bddd302e [diff] |
am 85f10039: (-s ours) Import translations. DO NOT MERGE * commit '85f100390bce9d82e8d855e3a9cd0d1d03684cef': Import translations. DO NOT MERGE