commit | 3225addcb289426f54eee6dba03551b6932032c2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:25:20 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:25:20 2015 +0000 |
tree | 382bb4e08fb0eff5fbe14de25243a7b8cf252041 | |
parent | 43f9a00c792966e0f875179163499bb984a86cf1 [diff] | |
parent | 9e5af63c6e97e6e5fc0e47502cd0e7d9004aac71 [diff] |
am 9e5af63c: (-s ours) Import translations. DO NOT MERGE * commit '9e5af63c6e97e6e5fc0e47502cd0e7d9004aac71': Import translations. DO NOT MERGE