| commit | b57d1ffe02049d85409131844c836e569cbccce2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:08:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:08:39 2014 +0000 |
| tree | cfc4dabf05af2268cc0c3bb773939e8a7a315809 | |
| parent | 3939d6abf2a4b514e322c1c669da97614ac4510a [diff] | |
| parent | c6a1070bd64bb7eb6cd13c6e3fdb0d33ab19d1f0 [diff] |
am c6a1070b: (-s ours) am 9be80ee5: (-s ours) Import translations. DO NOT MERGE * commit 'c6a1070bd64bb7eb6cd13c6e3fdb0d33ab19d1f0': Import translations. DO NOT MERGE