Merge "Add javadoc for display orientation." into gingerbread