| commit | 016b5ec3d42c539c4c684976ba8c098a1fd0c4ff | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Wed Oct 28 23:46:02 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 28 23:46:02 2009 -0700 |
| tree | a15641fdfc8a7666264266984bfc30b8124bbc1f | |
| parent | d6d6db484d0f59f55ded9f3548324af82d461055 [diff] | |
| parent | 20fcfac829f4919157bd986cdae29f27669f99dc [diff] |
am 20fcfac8: (-s ours) am 34180d32: am a47d1536: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2 Merge commit '20fcfac829f4919157bd986cdae29f27669f99dc' * commit '20fcfac829f4919157bd986cdae29f27669f99dc': do not merge - Fix for issue 2184627 cherry picked from eclair-mr2