drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_frameworks_base/packages
History
Jason Monk 8e9440efde resolve merge conflicts of 9600df0 to stage-aosp-master am: f120cf3d88 am: 99db203f29 
am: 14e55354c2

Change-Id: Icf3490bfe111607ae1711ceef8ade55ed0b35ec9
2016-12-06 16:55:15 +00:00
..
BackupRestoreConfirmation
Revert "Import translations. DO NOT MERGE"
2016-12-05 18:58:24 +00:00
CaptivePortalLogin
Revert "Import translations. DO NOT MERGE"
2016-12-05 18:56:32 +00:00
CtsShim
…
DefaultContainerService
Revert "Import translations. DO NOT MERGE"
2016-12-05 18:55:03 +00:00
DocumentsUI
Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
2016-11-22 17:19:45 -08:00
EasterEgg
…
ExternalStorageProvider
Revert "Import translations. DO NOT MERGE"
2016-12-05 18:57:22 +00:00
ExtServices
Ranker --> Assistant.
2016-11-09 09:04:16 -05:00
ExtShared
…
FakeOemFeatures
…
FusedLocation
Revert "Import translations. DO NOT MERGE"
2016-12-05 18:55:30 +00:00
InputDevices
Revert "Import translations. DO NOT MERGE"
2016-12-05 18:56:56 +00:00
Keyguard
Revert "Import translations. DO NOT MERGE"
2016-12-05 18:59:42 +00:00
MtpDocumentsProvider
Import translations. DO NOT MERGE
2016-12-06 03:09:21 -08:00
Osu
osu: remove calls to deprecated APIs
2016-11-15 02:12:57 +00:00
PrintRecommendationService
Merge "Update Samsung Print Recommendation Plugin (to support Mopria printers)" am: 41f14f47a5 am: 3a1cf2281b am: 55b91fec65
2016-12-03 04:48:18 +00:00
PrintSpooler
Revert "Import translations. DO NOT MERGE"
2016-12-05 18:57:48 +00:00
services
…
SettingsLib
Import translations. DO NOT MERGE
2016-12-05 20:29:51 -08:00
SettingsProvider
Merge "Revert "Import translations. DO NOT MERGE""
2016-12-05 18:40:43 +00:00
SharedStorageBackup
…
Shell
Revert "Import translations. DO NOT MERGE"
2016-12-05 19:00:10 +00:00
StatementService
…
SystemUI
resolve merge conflicts of 9600df0 to stage-aosp-master am: f120cf3d88 am: 99db203f29
2016-12-06 16:55:15 +00:00
VpnDialogs
Revert "Import translations. DO NOT MERGE"
2016-12-05 19:02:20 +00:00
WallpaperBackup
…
WallpaperCropper
…
WAPPushManager
…