am 60e13114: (-s ours) am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
* commit '60e13114':
DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.