am 8625c795: (-s ours) am 385d0519: am b16a6d6e: Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2

* commit '8625c7957ccb71e11c79137ff58be6fe066da0bd':
  DO NOT MERGE Fix rotation and memory use bugs