am 07a27222: Merge "Increment Version to 2.2_r4" into froyo

* commit '07a27222875557196b70b458d73bc6623ad9463b':
  Increment Version to 2.2_r4