| commit | e772eb7af049b55c89241fae799569030c1f5570 | [log] [tgz] |
|---|---|---|
| author | Eric Olsen <eolsen@android.com> | Wed Nov 04 17:36:59 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 04 17:36:59 2009 -0800 |
| tree | 658ce00086ede62d294d0f93ad93712ab35fb7b6 | |
| parent | 05abe8d01d91389b4b52111ed525aa4c4f4e1b71 [diff] | |
| parent | 62335430b05d92ad2255bf20b76b35e012b385c9 [diff] |
am 62335430: Merge change I4499ad72 into eclair Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-mr2 * commit '62335430b05d92ad2255bf20b76b35e012b385c9': Fix bad merge fixes build breakage.