979002871ddc417dfdfb6a6542b9018626af7883
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
Description
No description provided
Languages
C
87.8%
Shell
6.6%
Makefile
3.1%
C++
1%
Python
0.7%
Other
0.8%