tree a3c79dcc3272a810f31d7aa45b6de8d7c0cb978a
parent 535f6f67ecfb16bbdc3d9adf8867e3c91be005fc
parent a5fe776a7933b2241858ef83f01b812c7badc231
author Vasu Nori <vnori@google.com> 1279578550 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279578550 -0700

am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread

Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp

* commit 'a5fe776a7933b2241858ef83f01b812c7badc231':
  fix javadoc error which breaks SDK build in gingerbread