Merge commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9' into gingerbread-plus-aosp * commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9': Revert orientation change.
Merge commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9' into gingerbread-plus-aosp * commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9': Revert orientation change.