Merge commit '833533c9292f860e4dfc060a4eba6429cd259ed4' into gingerbread-plus-aosp * commit '833533c9292f860e4dfc060a4eba6429cd259ed4': Improve Display javadoc slightly
Merge commit '833533c9292f860e4dfc060a4eba6429cd259ed4' into gingerbread-plus-aosp * commit '833533c9292f860e4dfc060a4eba6429cd259ed4': Improve Display javadoc slightly