Merge remote-tracking branch 'origin/release/release_SDL_RB_B3.2' into develop
authorIgor Kozyrenko <IKozyrenko@luxoft.com>
Fri, 21 Mar 2014 15:48:03 +0000 (17:48 +0200)
committerJustin Dickow <jjdickow@gmail.com>
Tue, 8 Jul 2014 21:57:11 +0000 (17:57 -0400)
commita3ee465d6fad98984e41369fb39e34ee4c63dfab
treeb1f5b8da95f35885b08507db6a46c1b32a3a5e0c
parent677ba269853cfa38b0f3769f57b46187b69ee64f
Merge remote-tracking branch 'origin/release/release_SDL_RB_B3.2' into develop

Signed-off-by: Justin Dickow <jjdickow@gmail.com>
Conflicts:
src/components/application_manager/CMakeLists.txt
src/components/application_manager/src/application_impl.cc
src/components/application_manager/src/commands/mobile/set_display_layout_request.cc
src/components/application_manager/src/hmi_command_factory.cc
src/components/application_manager/src/resume_ctrl.cpp
Not a subject for review: code already reviewed

Conflicts:
src/appMain/policy_table.json
src/appMain/policy_table.json
src/components/application_manager/src/commands/mobile/add_command_request.cc
src/components/application_manager/src/resume_ctrl.cpp