Eric Fischer 403f16ae0b Merge changes I40bfa0f8,I9fe6a999 ...

* changes:
  Restore deleted string still referenced from AndroidManifest.
  Import revised translations.

2010-11-10 10:26:08 -08:00

..

DefaultContainerService

Import revised translations.

2010-11-09 17:25:54 -08:00

SettingsProvider

Adjust default screen timeout.

2010-11-05 11:22:21 -07:00

SystemUI

Merge changes I40bfa0f8,I9fe6a999

2010-11-10 10:26:08 -08:00

TtsService

am 3b197dfc: am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread

2010-09-30 11:27:47 -07:00

VpnServices

Import revised translations.

2010-11-09 17:25:54 -08:00