am 99866c11: am 9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread

* commit '99866c111bd72a6cc9be17b127cd40ec9396ca7d':
  Revert "allow all 4 orientations"