Merge commit '272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp * commit '272b504ee6aaf2515572520cd642f9a4fbf81a44': Tame the monkey.
Merge commit '272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp * commit '272b504ee6aaf2515572520cd642f9a4fbf81a44': Tame the monkey.