| commit | 34180d328c57a6a38bc85651fda0e69890ad7a9b | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Wed Oct 28 10:26:33 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 28 10:26:33 2009 -0700 |
| tree | 5bd7d26be381153f31e9792c65151c303de26d2d | |
| parent | 76a5429407e821c22508eca92e7475b6433cd668 [diff] | |
| parent | a47d153647d8750b667942ad80e7b905ea98c68b [diff] |
am a47d1536: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2 Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-mr2 * commit 'a47d153647d8750b667942ad80e7b905ea98c68b': do not merge - Fix for issue 2184627 cherry picked from eclair-mr2