| commit | 8e49e998fd66905904fbc9fc8e1022430b3b1780 | [log] [tgz] |
|---|---|---|
| author | Eric Olsen <eolsen@android.com> | Wed Nov 04 17:36:26 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 04 17:36:26 2009 -0800 |
| tree | 3074acc24a77c22a6c3fe35c8e66f70ee5344431 | |
| parent | 075b09a149cf28c222c41678a72bb83b0cc3681e [diff] | |
| parent | 62335430b05d92ad2255bf20b76b35e012b385c9 [diff] |
am 62335430: Merge change I4499ad72 into eclair Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-plus-aosp * commit '62335430b05d92ad2255bf20b76b35e012b385c9': Fix bad merge fixes build breakage.