| commit | 37d58711f63052137e79b4fa319480299de535a6 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 24 11:54:52 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 24 11:54:52 2010 -0700 |
| tree | c90d3a848663402c9d77db36088aeb09fa236095 | |
| parent | baf6e35473ee5d0fd34006cd4f821129845b1d31 [diff] | |
| parent | 979002871ddc417dfdfb6a6542b9018626af7883 [diff] |
am 97900287: am 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Merge commit '979002871ddc417dfdfb6a6542b9018626af7883' * commit '979002871ddc417dfdfb6a6542b9018626af7883': fix bug in applying patches remove shadowed variable declaration