Jean-Baptiste Queru e7339d804d resolved conflicts for merge of acb5f383 to jb-dev-plus-aosp ...

Change-Id: I79f0394b20a61dc7e6faabdb74c66277f71dfcb3

2012-05-04 19:18:00 -07:00

..

BackupRestoreConfirmation

…

DefaultContainerService

Fix some problems with ASECs

2012-05-02 17:09:57 -07:00

FakeOemFeatures

…

InputDevices

Add yet more keyboard layouts.

2012-04-25 18:17:21 -07:00

SettingsProvider

Fetch WifiManager instance at the time of use

2012-04-27 14:42:42 -07:00

SharedStorageBackup

…

SystemUI

resolved conflicts for merge of acb5f383 to jb-dev-plus-aosp

2012-05-04 19:18:00 -07:00

VpnDialogs

…

WAPPushManager

…