Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp * commit 'a5fe776a7933b2241858ef83f01b812c7badc231': fix javadoc error which breaks SDK build in gingerbread
Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp * commit 'a5fe776a7933b2241858ef83f01b812c7badc231': fix javadoc error which breaks SDK build in gingerbread