am f7ee88af: Merge "Fix Broken LinkifyTest Tests" into froyo

* commit 'f7ee88af00bc07eeeb904d92d033aca3e2a0961f':
  Fix Broken LinkifyTest Tests