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