Simon Dean
f456ce8dfa
Merge remote-tracking branch 'origin/JourneyOS' into crankshaft-ng
# Conflicts:
# CMakeLists.txt
# include/f1x/openauto/autoapp/Projection/IVideoOutput.hpp
# include/f1x/openauto/autoapp/Projection/InputEvent.hpp
# include/f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp
# include/f1x/openauto/autoapp/Service/AudioInputService.hpp
# include/f1x/openauto/autoapp/Service/AudioService.hpp
# include/f1x/openauto/autoapp/Service/BluetoothService.hpp
# include/f1x/openauto/autoapp/Service/InputService.hpp
# include/f1x/openauto/autoapp/Service/MediaSink/GuidanceAudioService.hpp
# include/f1x/openauto/autoapp/Service/MediaSink/MediaAudioService.hpp
# include/f1x/openauto/autoapp/Service/MediaSink/VideoService.hpp
# include/f1x/openauto/autoapp/Service/Sensor/SensorService.hpp
# include/f1x/openauto/autoapp/Service/VideoService.hpp
# include/f1x/openauto/autoapp/Service/WifiService.hpp
# include/f1x/openauto/btservice/AndroidBluetoothServer.hpp
# src/autoapp/Service/AndroidAutoEntity.cpp
# src/autoapp/Service/MediaAudioService.cpp
# src/autoapp/Service/SensorService.cpp
# src/autoapp/Service/ServiceFactory.cpp
# src/autoapp/Service/SpeechAudioService.cpp
# src/autoapp/Service/SystemAudioService.cpp
# src/autoapp/Service/WifiService.cpp
# src/autoapp/autoapp.cpp
# src/btservice/AndroidBluetoothServer.cpp