| commit | 54940ba8fd4eaf012818953069bfdaed1f4e0427 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Dec 10 23:42:58 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 10 23:42:58 2009 -0800 |
| tree | c01b8d457441ce9f1fc322e78e1004d409b6692b | |
| parent | 0b93e39f5244a6ef56d9b694e9ff150dbbafaebd [diff] | |
| parent | 71988369e394870056a55ca142fd4aaf5264ef41 [diff] |
am 71988369: (-s ours) am 4d272fe9: am 282a7423: (-s ours) Merge change I3c299167 into eclair Merge commit '71988369e394870056a55ca142fd4aaf5264ef41' * commit '71988369e394870056a55ca142fd4aaf5264ef41': Import revised translations. DO NOT MERGE