am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating...
am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
* commit '0eac0927':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.