Kristian Monsen 1456758802 resolved conflicts for merge of 58a1ca66 to master-chromium ...

Change-Id: I06b61e6d7d52b584eae03a95220381475b8bff0e

2013-02-14 19:48:27 -08:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2012-11-27 13:00:43 -08:00

DefaultContainerService

am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev

2012-11-29 14:25:40 -08:00

FakeOemFeatures

…

FusedLocation

dual-mode switching single/multiuser ServiceWatcher

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

InputDevices

frameworks/base: Added English UK keyboard layout for physical keyboards

2013-01-22 22:22:54 +00:00

SettingsProvider

am 3c239d7e: am 8934c575: am 88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"

2013-02-06 20:55:58 -08:00

SharedStorageBackup

…

Shell

App ops: cleanup, handle root and shell, perms.

2013-02-11 15:33:48 -08:00

SystemUI

resolved conflicts for merge of 58a1ca66 to master-chromium

2013-02-14 19:48:27 -08: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