| commit | f693ff9efa2ea0a3ec390fa390090a895b971b8c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 15 19:02:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 15 19:02:00 2014 +0000 |
| tree | 968abe5dff94f59043451c62df61c8e6c9d10ad3 | |
| parent | e421f609eb6203d2ed54ebf6c98f2f9d6b33e0eb [diff] | |
| parent | 43826e669679b7463cf715a7003e5641f7d24e78 [diff] |
am 43826e66: (-s ours) am d33d2127: (-s ours) am d3affe47: (-s ours) Import translations. DO NOT MERGE * commit '43826e669679b7463cf715a7003e5641f7d24e78': Import translations. DO NOT MERGE