am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size...
am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
* commit '1e662c32':
DO NOT MERGE. Integrate from master: Rework display size access.