am 30ed25c2: Merge "revert the stripping of System Group: from the names of...
am 30ed25c2: Merge "revert the stripping of System Group: from the names of google system groups" into froyo
Merge commit '30ed25c2' into froyo-plus-aosp
* commit '30ed25c2':
revert the stripping of System Group: