tree 20e3596bf3d2e2cdcea70b4d9c0ddab4d05cda92
parent d90a2c4d4463085155444efb07eba2d6579b444a
parent 9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3
author Dianne Hackborn <hackbod@google.com> 1305576177 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305576177 -0700

am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2

* commit '9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3':
  DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.