Elliott Hughes 10596fbcce resolved conflicts for merge of 3ce4f3d0 to master ...

Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210

2014-04-28 13:53:25 -07:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2014-04-16 15:17:04 -07:00

DefaultContainerService

resolved conflicts for merge of 3ce4f3d0 to master

2014-04-28 13:53:25 -07:00

DocumentsUI

Import translations. DO NOT MERGE

2014-04-23 12:05:40 -07:00

ExternalStorageProvider

Add directory selection to DocumentsProvider.

2014-04-22 22:18:21 -07:00

FakeOemFeatures

…

FusedLocation

Import translations. DO NOT MERGE

2014-04-16 14:24:32 -07:00

InputDevices

Import translations. DO NOT MERGE

2014-04-07 09:10:03 -07:00

Keyguard

Merge "Add carrier text on lockscreen in top left corner."

2014-04-28 12:18:44 +00:00

PrintSpooler

Import translations. DO NOT MERGE

2014-04-16 14:25:21 -07:00

services

Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.

2014-04-18 16:39:47 -07:00

SettingsProvider

set the sysui settings on create, as well as on update.

2014-03-19 16:18:27 -04:00

SharedStorageBackup

…

Shell

Fixed shell manifest to use correct permission.

2014-04-23 10:23:07 -07:00

SystemUI

Merge "Attemp to fix blank lockscreen #2."

2014-04-28 19:08:41 +00:00

VpnDialogs

Fix recents theme, add missing headers

2014-04-02 15:39:13 -07:00

WallpaperCropper

Fix recents theme, add missing headers

2014-04-02 15:39:13 -07:00

WAPPushManager

…