am 01ff7c1e: Merge "Bump Version Number to 2.3_r2" into gingerbread

* commit '01ff7c1e7c5a0c91ee81ab1fc1f8e659b3e3fe6d':
  Bump Version Number to 2.3_r2