| commit | 0fc3be50d695bac01c01385439bfaf589edceace | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 13:02:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 13:02:48 2015 +0000 |
| tree | 458ff0a2a8b44a1bef0af58f7872090af9dd5bbe | |
| parent | 0e1b6e33f01c8a149637aa111c1ca6bed78a4060 [diff] | |
| parent | 237e2e0c9f9f2f8cfa56bf30f8169f9d682f4618 [diff] |
am 237e2e0c: (-s ours) Import translations. DO NOT MERGE * commit '237e2e0c9f9f2f8cfa56bf30f8169f9d682f4618': Import translations. DO NOT MERGE