tree 5797ce3709bc320265cc9813cbf915f88d9c70d1
parent ec2c9751d802853ac1e9898cbcebf47efe7668d8
parent d3cf1ea694aa302804687b50aa8ce6306903382a
author Dianne Hackborn <hackbod@google.com> 1305577134 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305577134 -0700

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 '60e13114eb806d50b7b362d39051c5c775704bf6':
  DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked.