Kenny Root 6a0db59901 resolved conflicts for merge of e0b14ea7 to master ...

Change-Id: Ie018d3e2eba1eb2d655c153880e1951b68c2bd51

2013-12-13 15:59:51 -08:00

..

BackupRestoreConfirmation

Remove deprecated locales

2013-12-09 22:41:12 +00:00

DefaultContainerService

Remove deprecated locales

2013-12-09 22:41:12 +00:00

DocumentsUI

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

ExternalStorageProvider

Remove deprecated locales

2013-12-09 22:41:12 +00:00

FakeOemFeatures

Fix issue #8582003: Evernote Camera Capture Failure

2013-04-11 17:29:32 -07:00

FusedLocation

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

InputDevices

Import translations. DO NOT MERGE

2013-12-02 10:15:07 -08:00

Keyguard

Merge "Adding INfcUnlockSettings and NfcUnlock interface class."

2013-12-12 17:36:40 +00:00

PrintSpooler

Remove deprecated locales

2013-12-09 22:41:12 +00:00

services

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

SettingsProvider

Remove deprecated locales

2013-12-09 22:41:12 +00:00

SharedStorageBackup

Catch a few extra users of UserEnvironment.

2013-08-11 17:42:17 -07:00

Shell

Remove deprecated locales

2013-12-09 22:41:12 +00:00

SystemUI

Remove deprecated locales

2013-12-09 22:41:12 +00:00

VpnDialogs

Remove deprecated locales

2013-12-09 22:41:12 +00:00

WallpaperCropper

Fix wallpaper cropping bugs

2013-12-02 15:05:44 -08:00

WAPPushManager

Telephony: Use IccUtils from uicc package

2012-12-10 10:35:08 -08:00