tree b656271ac64973668be3222dd681560d9c8abc44
parent 5becdc32c899f1e8031f5a694c064cb559a8fc88
parent 5fbaefc3d8840aac12b16458347b3c1ddbdaf542
author Fred Quintana <fredq@google.com> 1254788851 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254788851 -0700

am 5fbaefc3: Merge change I4db3a5b3 into eclair

Merge commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542' into eclair-mr2

* commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542':
  fix a javadoc build breakage