am 9df14085: am 29332971: Merge "Add javadoc for display orientation." into gingerbread

Merge commit '9df140851375a977ad99390d71edf8b4a8382fd4'

* commit '9df140851375a977ad99390d71edf8b4a8382fd4':
  Add javadoc for display orientation.