| commit | 20fcfac829f4919157bd986cdae29f27669f99dc | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Wed Oct 28 10:37:13 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 28 10:37:13 2009 -0700 |
| tree | cef084d5e4967a3659d5f0ecf4910d05ce78b724 | |
| parent | e113d6af6204dac03b13b324852fe7f741ebb3d3 [diff] | |
| parent | 34180d328c57a6a38bc85651fda0e69890ad7a9b [diff] |
am 34180d32: am a47d1536: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2 Merge commit '34180d328c57a6a38bc85651fda0e69890ad7a9b' into eclair-mr2-plus-aosp * commit '34180d328c57a6a38bc85651fda0e69890ad7a9b': do not merge - Fix for issue 2184627 cherry picked from eclair-mr2