| commit | b6eeec4bf7f905c57b81c6bc6d0789a4d2945058 | [log] [tgz] |
|---|---|---|
| author | Dmitri Plotnikov <dplotnikov@google.com> | Wed Dec 02 21:27:15 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 02 21:27:15 2009 -0800 |
| tree | e1c4324198313c881181f64bf281d8a86ccb69d9 | |
| parent | fada1f08e7ffc8012bf2175f61f3ef3270eba9ec [diff] | |
| parent | 1b6c85b96f5cccae94d8bad6ea727accacfb7a0f [diff] |
am 1b6c85b9: (-s ours) DO NOT MERGE cherry-pick of CL I0ff20aa2 from eclair-mr2 Merge commit '1b6c85b96f5cccae94d8bad6ea727accacfb7a0f' into eclair-mr2 * commit '1b6c85b96f5cccae94d8bad6ea727accacfb7a0f': DO NOT MERGE cherry-pick of CL I0ff20aa2 from eclair-mr2