am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base