tree 98292f3c3e9ecfd31e14454b3d9b9ed2fdce43b2
parent 2f536b18c447ad0000afcd578aa3985b8e1557bc
parent b38ecce234b0ab32a33f8f65d4f7b1b6f13006cd
author Daniel Sandler <dsandler@android.com> 1354864960 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354864960 -0800

am b38ecce2: am 40ddc2bf: am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev

* commit 'b38ecce234b0ab32a33f8f65d4f7b1b6f13006cd':
  Fix longstanding nonsense in javadocs.