am 04eaeae3: am f724dbf7: Merge from gingerbread

* commit '04eaeae3108774671e4f8aac8592353ea79c24ad':
  2.3.1