am f97ed771: (-s ours) am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE.  Integrate from master: Rework display size access." into honeycomb-mr2

* commit 'f97ed771979162c4a2a75959c57fb793438a3a8b':
  DO NOT MERGE.  Integrate from master: Rework display size access.