am 73550d28: merge from froyo-plus-aosp

Merge commit '73550d28df4b7ee2faa39cc4b1b4cc854343632a'

* commit '73550d28df4b7ee2faa39cc4b1b4cc854343632a':
  Settings: Add a hook for operator or vendor specific settings.
  replaced deprecated getIntent with parseURI