Kenny Root a7fb9d907c am 9396f183: resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp ...

* commit '9396f183c2db5d6167f39a8d5667fb4abcc96e5e':
  Try to free cache before giving up on install
  Robustly add symlink and add for non-primary users

2012-10-19 17:20:03 -07:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2012-10-03 19:38:55 -07:00

DefaultContainerService

Try to free cache before giving up on install

2012-10-18 17:21:59 -07:00

FakeOemFeatures

…

FusedLocation

Changes to support updating location providers.

2012-10-18 01:28:10 -05:00

InputDevices

…

SettingsProvider

Frameworks base: Promote dream setting defaults to config.

2012-10-19 11:32:03 -04:00

SharedStorageBackup

…

SystemUI

am f9a3616b: am 7ff0fa48: am 6dad395c: Merge "Fix transition into Recents with live wallpaper" into jb-mr1-dev

2012-10-19 13:26:55 -07:00

VpnDialogs

…

WAPPushManager

…