Elliott Hughes d9e6101862 am 05678e17: resolved conflicts for merge of 3ce4f3d0 to master ...

* commit '05678e17e8c079a1c1c144e23e40a7a644a0b040':
  Track libcore.os' move to android.system.

2014-04-28 21:22:01 +00:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

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

DefaultContainerService

am 05678e17: resolved conflicts for merge of 3ce4f3d0 to master

2014-04-28 21:22:01 +00:00

DocumentsUI

Import translations. DO NOT MERGE

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

ExternalStorageProvider

am 21de56a9: Add directory selection to DocumentsProvider.

2014-04-23 07:15:32 +00: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

am 3daa96f4: Merge "Add carrier text on lockscreen in top left corner."

2014-04-28 12:21:57 +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

…

SharedStorageBackup

…

Shell

am 3647eec9: Merge "Fixed shell manifest to use correct permission."

2014-04-25 17:01:28 +00:00

SystemUI

am 767c0116: Merge "Attemp to fix blank lockscreen #2."

2014-04-28 20:37:59 +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

…