Merge commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp * commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de': Doc change: escape angle brackets in javadoc comment.
Merge commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp * commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de': Doc change: escape angle brackets in javadoc comment.