am c55a6a42: (-s ours) am 2359d49b: Merge "DO NOT MERGE - redo  Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread

Merge commit 'c55a6a42afd328fd78e8cc307194e2ca33b81a04'

* commit 'c55a6a42afd328fd78e8cc307194e2ca33b81a04':
  DO NOT MERGE - redo  Ib5e519fb40d3191ecac06c03a844872df19f3963