Gilles Debunne ff3c191d2a resolved conflicts for merge of 8390651c to master ...

Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa

2010-10-05 12:11:56 -07:00

..

DefaultContainerService

am 4309b52f: am 735de3b3: Hash keys with MD5; track IBinders not IInterface

2010-09-30 19:47:06 -07:00

SettingsProvider

3012761 Please fix problems with your strings

2010-09-30 11:02:21 -07:00

SystemUI

resolved conflicts for merge of 8390651c to master

2010-10-05 12:11:56 -07: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. DO NOT MERGE

2010-09-29 14:29:00 -07:00