Merge commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08' into eclair-mr2-plus-aosp * commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08': fix bad link in javadoc that's breaking SDK build
Merge commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08' into eclair-mr2-plus-aosp * commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08': fix bad link in javadoc that's breaking SDK build