am 4e1a1002: Merge "Fix AccountManagerTest#testHasFeatureWithCallback" into froyo

* commit '4e1a1002f47c6cb764684e96fa92aca25b81adda':
  Fix AccountManagerTest#testHasFeatureWithCallback