Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
bbaf7644b260b2f66bab7300a1af9af8b729e2a6
frameworks_base/packages
History
Stanley Tng f093798a61 resolve merge conflicts of 23ccecc4ca to stage-aosp-master 
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5fbdb4b246cc34ac5c6fcfe39e41a16137e9f9ab
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a
Merged-In: Ia9df6facd99ae91ebb4a819f61ea27551ce35efe
2018-10-17 08:33:56 -07:00
..
BackupRestoreConfirmation
Import translations. DO NOT MERGE
2018-10-14 19:08:54 -07:00
CaptivePortalLogin
Import translations. DO NOT MERGE
2018-10-14 19:14:30 -07:00
CarrierDefaultApp
Import translations. DO NOT MERGE
2018-10-14 19:20:06 -07:00
CompanionDeviceManager
Remove BluetoothDevice.ACTION_DISAPPEARED
2018-10-11 21:06:29 +00:00
CtsShim
Remove workarounds for b/79755007
2018-09-13 22:25:58 -07:00
DefaultContainerService
Import translations. DO NOT MERGE
2018-10-14 19:25:54 -07:00
DocumentsUI
…
EasterEgg
P is for PAINT.
2018-06-27 18:58:59 -04:00
ExternalStorageProvider
Import translations. DO NOT MERGE
2018-10-14 19:31:30 -07:00
ExtServices
Add AndroidTest file for ExtServices
2018-10-03 16:43:09 -07:00
ExtShared
…
FakeOemFeatures
…
FusedLocation
Import translations. DO NOT MERGE
2018-10-14 19:37:07 -07:00
InputDevices
Import translations. DO NOT MERGE
2018-10-14 19:42:52 -07:00
Keyguard
…
MtpDocumentsProvider
…
overlays
Import translations. DO NOT MERGE
2018-10-14 20:46:25 -07:00
PrintRecommendationService
…
PrintSpooler
Import translations. DO NOT MERGE
2018-10-14 20:52:19 -07:00
services
PacProcessor: Include libpac as a JNI_SHARED_LIBRARY.
2018-05-15 11:23:53 +01:00
SettingsLib
resolve merge conflicts of 23ccecc4ca to stage-aosp-master
2018-10-17 08:33:56 -07:00
SettingsProvider
Import translations. DO NOT MERGE
2018-10-15 00:49:09 -07:00
SharedStorageBackup
…
Shell
Import translations. DO NOT MERGE
2018-10-14 20:58:03 -07:00
SimAppDialog
…
StatementService
…
SystemUI
Merge "Fix overlap between operator name and heads-up notification"
2018-10-15 15:56:13 -07:00
VpnDialogs
Import translations. DO NOT MERGE
2018-10-14 22:34:46 -07:00
WallpaperBackup
…
WallpaperCropper
…
WAPPushManager
Do not clear data for WAPPushManager settings
2018-08-09 15:14:49 +02:00