diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2018-11-16 16:25:39 -0500 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2018-11-16 16:25:39 -0500 |
| commit | 551e5eeed41767ab11e677ce345c67b661b687c8 (patch) | |
| tree | 3794c0153e930c791039ed6351b77b8904bcec23 /src/components/interfaces/HMI_API.xml | |
| parent | dc2dc33575394ae16d72a745e278279e0a2700a1 (diff) | |
| parent | d8ad4e0427b33087340aa34cf1e1d3954cdb793e (diff) | |
| download | sdl_core-551e5eeed41767ab11e677ce345c67b661b687c8.tar.gz | |
Merge remote-tracking branch 'origin/feature/cloud_app_connection_flow' into feature/cloud_app_connection_status
# Conflicts:
# src/components/application_manager/include/application_manager/application.h
# src/components/application_manager/include/application_manager/application_impl.h
Diffstat (limited to 'src/components/interfaces/HMI_API.xml')
0 files changed, 0 insertions, 0 deletions