Elliott Hughes ccec5f0def resolved conflicts for merge of 02e85744 to master ...

Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9

2014-04-24 17:18:10 -07:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

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

DefaultContainerService

Import translations. DO NOT MERGE

2014-04-23 12:12:46 -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

resolved conflicts for merge of 02e85744 to master

2014-04-24 17:18:10 -07: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

Import translations. DO NOT MERGE

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

SystemUI

Merge "Enabling doc centric recents on phones."

2014-04-24 23:24:40 +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

…