Merge commit '7171ea8179e09270e4d6ab825a2320816eee39c5' into froyo-plus-aosp * commit '7171ea8179e09270e4d6ab825a2320816eee39c5': Make ThrottleService more tamper resistant.
Merge commit '7171ea8179e09270e4d6ab825a2320816eee39c5' into froyo-plus-aosp * commit '7171ea8179e09270e4d6ab825a2320816eee39c5': Make ThrottleService more tamper resistant.