APPLINK-6502 APPLINK-6529 OnSystemRequest and grammarID
authorAlexander Kutsan <AKutsan@luxoft.com>
Tue, 1 Apr 2014 14:07:02 +0000 (17:07 +0300)
committerJustin Dickow <jjdickow@gmail.com>
Tue, 8 Jul 2014 22:36:07 +0000 (18:36 -0400)
commit526ffee3eabe598492120e1cf3d9547c5475f995
treefdc45d63cd20b672d07d0f5b9c52585348a9a94f
parent5512c3dc0d69471c730599122b04a6f76ae9f4e4
APPLINK-6502 APPLINK-6529 OnSystemRequest and grammarID

Signed-off-by: Justin Dickow <jjdickow@gmail.com>
Conflicts:
src/components/application_manager/src/application_impl.cc
src/components/application_manager/src/commands/mobile/perform_interaction_request.cc
19 files changed:
src/components/application_manager/include/application_manager/application.h
src/components/application_manager/include/application_manager/application_manager_impl.h
src/components/application_manager/include/application_manager/commands/mobile/create_interaction_choice_set_request.h
src/components/application_manager/include/application_manager/commands/mobile/perform_interaction_request.h
src/components/application_manager/include/application_manager/commands/mobile/put_file_request.h
src/components/application_manager/include/application_manager/smart_object_keys.h
src/components/application_manager/src/application_impl.cc
src/components/application_manager/src/application_manager_impl.cc
src/components/application_manager/src/commands/hmi/on_put_file_notification.cc
src/components/application_manager/src/commands/hmi/on_system_request_notification.cc
src/components/application_manager/src/commands/mobile/add_command_request.cc
src/components/application_manager/src/commands/mobile/create_interaction_choice_set_request.cc
src/components/application_manager/src/commands/mobile/on_system_request_notification.cc
src/components/application_manager/src/commands/mobile/perform_interaction_request.cc
src/components/application_manager/src/commands/mobile/put_file_request.cc
src/components/application_manager/src/resume_ctrl.cpp
src/components/interfaces/HMI_API.xml
src/components/interfaces/MOBILE_API.xml
src/components/interfaces/QT_HMI_API.xml