OSDN Git Service

resolve merge conflicts of 3b7bac537d0b to master
[android-x86/frameworks-base.git] / services /
2017-07-05 Jason Monkresolve merge conflicts of 3b7bac537d0b to master
2017-07-05 Andrew SappersteinMerge "Use SystemUiContext for immersive mode cling...
2017-07-05 Jason MonkMerge "Tiny visual tweaks to QS" into oc-dr1-dev
2017-07-05 Jason MonkMerge "Tiny visual tweaks to QS" into oc-dr1-dev
2017-07-05 Andrew SappersteinMerge "Use SystemUiContext for immersive mode cling...
2017-07-05 Andrew SappersteinMerge "Use SystemUiContext for immersive mode cling...
2017-07-05 Lucas DupinMerge "Dark text support on Recents" into oc-dr1-dev...
2017-07-05 Lucas DupinMerge "Dark text support on Recents" into oc-dr1-dev
2017-07-05 Lucas DupinMerge "Dark text support on Recents" into oc-dr1-dev
2017-07-05 Erik KlineBetter logging infrastructure in OffloadHardwareInterfa...
2017-07-05 Erik KlineBetter logging infrastructure in OffloadHardwareInterface
2017-07-05 Hugo BenichiMerge "ConnectivityManager: allow usage of TYPE_NONE...
2017-07-05 Hugo BenichiMerge "ConnectivityManager: allow usage of TYPE_NONE...
2017-07-05 Hugo BenichiMerge "ConnectivityManager: allow usage of TYPE_NONE...
2017-07-05 Hugo BenichiMerge "ConnectivityServiceTest: more informative assert...
2017-07-05 Hugo BenichiMerge "ConnectivityManager: allow usage of TYPE_NONE"
2017-07-05 Hugo BenichiMerge "ConnectivityServiceTest: more informative assert...
2017-07-05 Hugo BenichiMerge "ConnectivityServiceTest: more informative assert...
2017-07-05 Treehugger RobotMerge "ConnectivityManager: allow usage of TYPE_NONE"
2017-07-05 Hugo BenichiMerge "ConnectivityServiceTest: more informative assert...
2017-07-05 Hugo BenichiMerge "ConnectivityServiceTest: eliminate remaining...
2017-07-05 Hugo BenichiMerge "ConnectivityServiceTest: eliminate remaining...
2017-07-05 Hugo BenichiMerge "ConnectivityServiceTest: eliminate remaining...
2017-07-05 Hugo BenichiMerge "ConnectivityServiceTest: eliminate remaining...
2017-07-05 Hugo BenichiConnectivityManager: allow usage of TYPE_NONE
2017-07-05 Erik KlineBetter logging infrastructure in OffloadHardwareInterface
2017-07-05 Erik KlineDO NOT MERGE ANYWHERE am: 53e5c05d83 -s ours
2017-07-05 Erik KlineDO NOT MERGE ANYWHERE
2017-07-05 Erik Klineresolve merge conflicts of b1eb85c9a8d3 to stage-aosp...
2017-07-05 Erik Klineresolve merge conflicts of b1eb85c9a8d3 to stage-aosp...
2017-07-05 Erik Klineresolve merge conflicts of b1eb85c9a8d3 to stage-aosp...
2017-07-05 Erik Klineresolve merge conflicts of b1eb85c9a8d3 to stage-aosp...
2017-07-05 Treehugger RobotMerge "Switch to USB_CONFIGURED as the primary USB...
2017-07-05 Erik KlineSwitch to USB_CONFIGURED as the primary USB readiness...
2017-07-05 Erik KlineSwitch to USB_CONFIGURED as the primary USB readiness...
2017-07-05 Erik KlineSwitch to USB_CONFIGURED as the primary USB readiness...
2017-07-05 Erik KlineSwitch to USB_CONFIGURED as the primary USB readiness...
2017-07-05 Erik KlineSwitch to USB_CONFIGURED as the primary USB readiness...
2017-07-05 Erik KlineSwitch to USB_CONFIGURED as the primary USB readiness...
2017-07-04 Erik KlineSwitch to USB_CONFIGURED as the primary USB readiness...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityManager: allow usage of...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityServiceTest: more informativ...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityServiceTest: eliminate remai...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityManager: allow usage of...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityServiceTest: more informativ...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityServiceTest: eliminate remai...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityManager: allow usage of...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityServiceTest: more informativ...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityManager: allow usage of...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityServiceTest: eliminate remai...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityServiceTest: more informativ...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityServiceTest: eliminate remai...
2017-07-04 Roland LevillainMerge "Revert "ConnectivityManager: allow usage of...
2017-07-04 Roland LevillainRevert "ConnectivityManager: allow usage of TYPE_NONE"
2017-07-04 Roland LevillainMerge "Revert "ConnectivityServiceTest: eliminate remai...
2017-07-04 Hugo BenichiMerge "ConnectivityServiceTest: eliminate remaining...
2017-07-04 Hugo BenichiMerge "ConnectivityServiceTest: eliminate remaining...
2017-07-04 Hugo BenichiMerge changes I90c211dc,I4455f272 am: a0ff4efc8b am...
2017-07-04 Hugo BenichiMerge changes I90c211dc,I4455f272 am: a0ff4efc8b am...
2017-07-04 Hugo BenichiMerge "ConnectivityServiceTest: eliminate remaining...
2017-07-04 Hugo BenichiMerge "ConnectivityServiceTest: eliminate remaining...
2017-07-04 Hugo BenichiMerge changes I90c211dc,I4455f272 am: a0ff4efc8b
2017-07-04 Hugo BenichiMerge changes I90c211dc,I4455f272
2017-07-04 Treehugger RobotMerge "ConnectivityServiceTest: eliminate remaining...
2017-07-04 Treehugger RobotMerge changes I90c211dc,I4455f272
2017-07-04 Hugo BenichiConnectivityManager: allow usage of TYPE_NONE
2017-07-04 Erik KlineMerge "Pass all offload-exempt prefixes into OffloadCon...
2017-07-04 Erik KlineMerge "Pass all offload-exempt prefixes into OffloadCon...
2017-07-04 TreeHugger RobotMerge "Pass all offload-exempt prefixes into OffloadCon...
2017-07-04 Joel ScherpelzMerge "Wakeup packet mark/mask configuration option...
2017-07-04 Joel ScherpelzMerge "Wakeup packet mark/mask configuration option...
2017-07-04 Joel ScherpelzMerge "Wakeup packet mark/mask configuration option...
2017-07-04 Joel ScherpelzMerge "Wakeup packet mark/mask configuration option"
2017-07-04 Treehugger RobotMerge "Wakeup packet mark/mask configuration option"
2017-07-04 TreeHugger RobotMerge "Mocked system properties should return default...
2017-07-03 Tobias ThiererMerge changes from topic 'revert-update-conscrypt'...
2017-07-03 Tobias ThiererRevert "Track updates to Conscrypt". DO NOT MERGE ANYWH...
2017-07-03 Tobias ThiererMerge changes from topic 'revert-update-conscrypt'...
2017-07-03 Tobias ThiererRevert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.
2017-07-03 TreeHugger RobotMerge changes from topic 'revert-update-conscrypt'...
2017-07-03 Selim CinekMerge "Improved Text transformations for notifications...
2017-07-03 Selim CinekMerge "Improved Text transformations for notifications...
2017-07-03 TreeHugger RobotMerge "Improved Text transformations for notifications...
2017-07-03 Adrian RoosMerge "AOD: Avoid double re-registration of sensors...
2017-07-03 Adrian RoosMerge "AOD: Avoid double re-registration of sensors...
2017-07-03 TreeHugger RobotMerge "AOD: Avoid double re-registration of sensors...
2017-07-03 Selim CinekMerge "Fixed an issue where the shelf could be hidden...
2017-07-03 Selim CinekMerge "Fixed an issue where the shelf could be hidden...
2017-07-03 Selim CinekMerge "Fixed an issue where the shelf could be hidden...
2017-07-03 Tony MakMocked system properties should return default value...
2017-07-03 Neil FullerMerge "Add dumpsys support to RulesManagerService"...
2017-07-03 Hugo BenichiMerge "Networking unit tests: fix some flaky tests...
2017-07-03 Neil FullerMerge "Add dumpsys support to RulesManagerService"...
2017-07-03 Hugo BenichiMerge "Networking unit tests: fix some flaky tests...
2017-07-03 Neil FullerMerge "Add dumpsys support to RulesManagerService"...
2017-07-03 Neil FullerMerge "Add dumpsys support to RulesManagerService"
2017-07-03 Hugo BenichiMerge "Networking unit tests: fix some flaky tests...
2017-07-03 Hugo BenichiMerge "Networking unit tests: fix some flaky tests"
2017-07-03 Neil FullerMerge "Add dumpsys support to RulesManagerService"
2017-07-03 Treehugger RobotMerge "Networking unit tests: fix some flaky tests"
next