tree 4f834b8aeb75fa50d2bfbdf84993f8e27a4a894f
parent c95b39d352924ed3528e82e689973ca52228ac1a
parent 3170f9a7cf32d6935e6c468e907f9b5427ebadbc
author Dmitri Plotnikov <dplotnikov@google.com> 1260914308 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260914308 -0800

am 3170f9a7: Fixing broken javadoc.

Merge commit '3170f9a7cf32d6935e6c468e907f9b5427ebadbc' into eclair-mr2-plus-aosp

* commit '3170f9a7cf32d6935e6c468e907f9b5427ebadbc':
  Fixing broken javadoc.