commit | 1a0f6a398d11db706b92fdc8ae438d7155c3fbaa | [log] [tgz] |
---|---|---|
author | Eric Fischer <enf@google.com> | Tue Dec 01 17:39:27 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 01 17:39:27 2009 -0800 |
tree | 4bfd9469731811e4156190a6f20a417ad5b44a7c | |
parent | 90452567f795b627f86ae46a37f9dc5e06a4997f [diff] | |
parent | bce66392fe728780bc203657f21e65ad53c097bb [diff] |
am bce66392: (-s ours) am f3e11426: am eaa01f68: (-s ours) Merge change I46fb1c7f into eclair Merge commit 'bce66392fe728780bc203657f21e65ad53c097bb' * commit 'bce66392fe728780bc203657f21e65ad53c097bb': Import revised translations. DO NOT MERGE