tree cf4f80e5eb6c9a0fa73e2cb19e4f02037f05f8e9
parent 3aa837cc0f459e1acf89280b724c0a70c50e61dd
parent 992a9e507fb1f8da7358b4d805c034d934eb1810
author Brad Fitzpatrick <bradfitz@android.com> 1286734496 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286734496 -0700

am 992a9e50: am fd124570: Merge "DropBox.Entry javadoc syntax fix" into gingerbread

Merge commit '992a9e507fb1f8da7358b4d805c034d934eb1810'

* commit '992a9e507fb1f8da7358b4d805c034d934eb1810':
  DropBox.Entry javadoc syntax fix