Brad Fitzpatrick 385a753dea resolved conflicts for merge of 368fdba4 to master ...

Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d

2010-10-21 07:39:10 -07:00

..

DefaultContainerService

Add API to check for emulated external storage

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

SettingsProvider

3012761 Please fix problems with your strings

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

SystemUI

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -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