| commit | 979002871ddc417dfdfb6a6542b9018626af7883 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:10:18 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 23 19:10:18 2010 -0700 |
| tree | 1580e8bafbe8a12d59820ef1b591b05bc093cf0b | |
| parent | c080bc549aaf272c77fe7903e52c2a2c0d8de1bb [diff] | |
| parent | 965f9dc45345486e885b59b4776f0ca5e765ec20 [diff] |
am 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Merge commit '965f9dc45345486e885b59b4776f0ca5e765ec20' into gingerbread-plus-aosp * commit '965f9dc45345486e885b59b4776f0ca5e765ec20': fix bug in applying patches remove shadowed variable declaration