| commit | c34118a70d5a9e91cfbb5c532d74aedd3d67d968 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 08 19:42:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 19:42:50 2014 +0000 |
| tree | f9bab3b1da80126380e2c2dc5e4800dc76efe5b6 | |
| parent | f10f2f47b5db1132362af9c76a1577ccc95fb92d [diff] | |
| parent | 9c00c3d57fcbaedfab096041fee4f4c2468b3ebf [diff] |
am 9c00c3d5: (-s ours) am 8510d014: (-s ours) Import translations. DO NOT MERGE * commit '9c00c3d57fcbaedfab096041fee4f4c2468b3ebf': Import translations. DO NOT MERGE