John Spurlock 8740cb1da6 resolved conflicts for merge of 29211d3a to master ...

Change-Id: I9691f41b12fbf52d0ef35a9bf5223edef7afdfd2

2013-04-05 16:18:59 -04:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2013-02-25 08:53:09 -08:00

DefaultContainerService

Improve performance of storage measurement.

2013-03-01 16:36:52 -08:00

FakeOemFeatures

…

FusedLocation

dual-mode switching single/multiuser ServiceWatcher

2013-02-01 16:00:20 -08:00

InputDevices

Add new physical keyboard layouts.

2013-03-30 19:29:40 +01:00

Keyguard

Import translations. DO NOT MERGE

2013-04-05 08:48:56 -07:00

SettingsProvider

Block access to accounts for limited users.

2013-03-30 18:25:49 -07:00

SharedStorageBackup

DO NOT MERGE - Full backup/restore now handles OBBs sensibly

2013-03-08 15:08:10 -08:00

Shell

Show notification ticker for finished bugreports.

2013-03-20 12:10:51 -07:00

SystemUI

resolved conflicts for merge of 29211d3a to master

2013-04-05 16:18:59 -04:00

VpnDialogs

VpnDialogs: filter obscured touches

2013-02-13 16:32:48 -08:00

WAPPushManager

Telephony: Use IccUtils from uicc package

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