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