am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2

* commit '6ad07db7a2c289d036f081eb0c7a666cdb77b548':
  Fix fake display size when rotated.