Merge commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44' into gingerbread-plus-aosp * commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44': Tools package was missing proguard.bat
Merge commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44' into gingerbread-plus-aosp * commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44': Tools package was missing proguard.bat