tree 4cfc65e97177d73c7a9c94b480805860c09b5ef8
parent e3fe04165b72dbb60db452d6b2593f96f3e6dd7d
parent 00a82605a17360f5b9005035a75d779a231d5a5c
author Scott Main <smain@google.com> 1340910399 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340910399 -0700

am 00a82605: am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev

* commit '00a82605a17360f5b9005035a75d779a231d5a5c':
  Minor corrections to the javadoc overview to reflect late API changes.