tree 81b14fb82ce8e951b01534e65e8b4bd4bdf6cb94
parent f384f417f26e3f4004afe28c03f81192e4b784b8
parent 54c4e02dbab94fe81cdb459d0b37ec48be688cdc
author Wu-cheng Li <wuchengli@google.com> 1286587718 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286587718 -0700

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

Merge commit '9df140851375a977ad99390d71edf8b4a8382fd4'

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