Fred Quintana 12a8a59e7a am 0fb041f3: am 3266c5f1: resolved conflicts for merge of f476c480 to eclair-mr2 ...

Merge commit '0fb041f364355c438eb7d508eb7fa7946418cd11'

* commit '0fb041f364355c438eb7d508eb7fa7946418cd11':
  remove the SubscribedFeedsProvider since it has been moved to vendor/google

2009-11-05 14:12:16 -08:00

..

SettingsProvider

Remove PowerManager.setAutoBrightness()

2009-10-16 07:42:26 -07:00

TtsService

Adding support for plugins.

2009-10-20 11:11:22 -07:00

VpnServices

Import revised translations. DO NOT MERGE

2009-10-28 21:16:52 -07:00