review.tizen.org Git - profile/ivi/smartdevicelink.git/commit

author	Nikolay Khlopkov <nkhlopkov@luxoft.com>
	Fri, 14 Mar 2014 07:04:16 +0000 (11:04 +0400)
committer	Justin Dickow <jjdickow@gmail.com>
	Tue, 8 Jul 2014 21:14:39 +0000 (17:14 -0400)
commit	e7e7b662fbc8c9dfa6a369b758c8a1e34ec4c741
tree	e6e0097055fb83c0a4ba7b00e95701568e3b0d6e	tree \| snapshot
parent	f043ea952caaffcaac5232fe31bf2fbdb9c67e78	commit \| diff

Merge branch 'develop' into APPLINK-6130-gtest_upgrade
No subject for review: merge

Signed-off-by: Justin Dickow <jjdickow@gmail.com>
Conflicts:
CMakeLists.txt
mobile/android/SyncProxyAndroid/androidTest/java/com/ford/syncV4/syncConnection/SyncConnectionTest.java
mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/protocol/WiProProtocol.java
mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/RPCMessageHandler.java
mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/SyncProxyALMManager.java
mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/SyncProxyBase.java
mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/proxy/interfaces/IProxyListenerBase.java
mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/session/Session.java
mobile/android/SyncProxyAndroid/src/main/java/com/ford/syncV4/syncConnection/SyncConnection.java
mobile/android/SyncProxyTester/src/main/AndroidManifest.xml
mobile/android/SyncProxyTester/src/main/assets/CHANGELOG.txt
mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/activity/SyncProxyTester.java
mobile/android/SyncProxyTester/src/main/java/com/ford/syncV4/android/service/ProxyService.java
src/components/transport_manager/src/tcp/tcp_client_listener.cc

CMakeLists.txt		diff \| blob \| history
mobile/android/SyncProxyTester/src/main/res/layout/alertmaneuver.xml	[new file with mode: 0644]	blob
src/components/HMI/app/controller/sdl/Controller.js		diff \| blob \| history
src/components/HMI/ffw/BasicCommunicationRPC.js		diff \| blob \| history
src/components/HMI/ffw/TTSRPC.js		diff \| blob \| history
src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h		diff \| blob \| history
src/components/application_manager/src/application_manager_impl.cc		diff \| blob \| history
src/components/application_manager/src/commands/hmi/on_system_context_notification.cc		diff \| blob \| history
src/components/application_manager/src/commands/mobile/delete_sub_menu_request.cc		diff \| blob \| history
src/components/application_manager/src/message_helper.cc		diff \| blob \| history
src/components/application_manager/src/resume_ctrl.cpp		diff \| blob \| history
src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h		diff \| blob \| history
src/components/rpc_base/include/rpc_base/dbus_message.h	[new file with mode: 0644]	blob
src/components/rpc_base/include/rpc_base/dbus_message_inl.h	[new file with mode: 0644]	blob
src/components/rpc_base/include/rpc_base/rpc_base.h		diff \| blob \| history
src/components/rpc_base/include/rpc_base/rpc_base_dbus_inl.h	[new file with mode: 0644]	blob
src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h		diff \| blob \| history
src/components/rpc_base/src/rpc_base/dbus_message.cc	[new file with mode: 0644]	blob
src/components/rpc_base/src/rpc_base/rpc_base.cc		diff \| blob \| history
src/components/rpc_base/src/rpc_base/rpc_message.cc		diff \| blob \| history
src/components/transport_manager/include/transport_manager/tcp/tcp_client_listener.h		diff \| blob \| history
src/components/transport_manager/include/transport_manager/transport_manager.h		diff \| blob \| history
src/components/transport_manager/include/transport_manager/transport_manager_impl.h		diff \| blob \| history
src/components/transport_manager/src/tcp/tcp_client_listener.cc		diff \| blob \| history
src/components/transport_manager/src/tcp/tcp_transport_adapter.cc		diff \| blob \| history
src/components/transport_manager/src/transport_manager_default.cc		diff \| blob \| history
src/components/transport_manager/src/transport_manager_impl.cc		diff \| blob \| history
test/components/application_manager/formatters_commands.h		diff \| blob \| history
test/components/rpc_base/CMakeLists.txt		diff \| blob \| history
test/components/rpc_base/rpc_base_dbus_test.cc	[new file with mode: 0644]	blob
test/components/rpc_base/rpc_base_test.cc		diff \| blob \| history
test/components/transport_manager/src/transport_manager.cc		diff \| blob \| history
test/tools/intergen/CMakeLists.txt		diff \| blob \| history
test/tools/intergen/src/generated_interface_tests.cc		diff \| blob \| history
test/tools/intergen/test_interface.xml		diff \| blob \| history
tools/intergen/GenerateInterfaceLibrary.cmake		diff \| blob \| history
tools/intergen/cppgen/CMakeLists.txt		diff \| blob \| history
tools/intergen/cppgen/include/cppgen/cpp_api_code_generator.h		diff \| blob \| history
tools/intergen/cppgen/include/cppgen/cpp_interface_code_generator.h		diff \| blob \| history
tools/intergen/cppgen/include/cppgen/declaration_generator.h		diff \| blob \| history
tools/intergen/cppgen/include/cppgen/definition_generator.h		diff \| blob \| history
tools/intergen/cppgen/include/cppgen/generator_preferences.h		diff \| blob \| history
tools/intergen/cppgen/include/cppgen/struct_type_constructor.h		diff \| blob \| history
tools/intergen/cppgen/include/cppgen/struct_type_dbus_serializer.h	[new file with mode: 0644]	blob
tools/intergen/cppgen/include/cppgen/struct_type_from_json_method.h		diff \| blob \| history
tools/intergen/cppgen/include/cppgen/type_name_code_generator.h		diff \| blob \| history
tools/intergen/cppgen/src/cppgen/cpp_api_code_generator.cc		diff \| blob \| history
tools/intergen/cppgen/src/cppgen/cpp_interface_code_generator.cc		diff \| blob \| history
tools/intergen/cppgen/src/cppgen/declaration_generator.cc		diff \| blob \| history
tools/intergen/cppgen/src/cppgen/definition_generator.cc		diff \| blob \| history
tools/intergen/cppgen/src/cppgen/generator_preferences.cc		diff \| blob \| history
tools/intergen/cppgen/src/cppgen/module_manager.cc		diff \| blob \| history
tools/intergen/cppgen/src/cppgen/struct_type_constructor.cc		diff \| blob \| history
tools/intergen/cppgen/src/cppgen/struct_type_dbus_serializer.cc	[new file with mode: 0644]	blob
tools/intergen/cppgen/src/cppgen/struct_type_from_json_method.cc		diff \| blob \| history
tools/intergen/cppgen/src/cppgen/type_name_code_generator.cc		diff \| blob \| history
tools/intergen/model/include/model/interface.h		diff \| blob \| history
tools/intergen/tool/intergen.cc		diff \| blob \| history