am 61d9ffbf: Merge "Do not merge." into gingerbread

* commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
  Do not merge.