commit | f5d04b06cf0a32b364402cc7c889d622f8658024 | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Fri Feb 10 10:15:42 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 10 10:15:42 2012 -0800 |
tree | 6c896de5d2049b5d98caa8a545c0d068e49a0bed | |
parent | d5af586101b6111ca188bb373098309c7c8a4abb [diff] | |
parent | b1134ce47336a9b3dfd650dbecbd8d0f38881d49 [diff] |
am b1134ce4: (-s ours) am 5d2ceed5: Import translations. DO NOT MERGE * commit 'b1134ce47336a9b3dfd650dbecbd8d0f38881d49': Import translations. DO NOT MERGE