| commit | 5ae171eb55bbc92d32c518524aafba4a8a6e67c0 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Wed Dec 02 20:39:51 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 02 20:39:51 2009 -0800 |
| tree | 0334aca65bfa0de3eaf4883d235aeb298b902c58 | |
| parent | a6f64107ac92386bb2ee4d6f2c45ffa1f46011be [diff] | |
| parent | 46a5604858cd35093b47da3ffdac471dd146f994 [diff] |
am 46a56048: (-s ours) am 558a3c41: am 9b8b1ef9: (-s ours) Merge change If84681a3 into eclair Merge commit '46a5604858cd35093b47da3ffdac471dd146f994' * commit '46a5604858cd35093b47da3ffdac471dd146f994': Import revised translations. DO NOT MERGE