Merge branch 'fold_rsid_screentype' of git@gitcode.com:wsen_drunk/window_window_manager_tdd.git into 'master' # Conflicts: # conflict window_scene/session/screen/include/screen_property.h # conflict window_scene/session/screen/include/screen_session.h |