Merge branch 'master' of jae.hwan.kim@165.213.180.234:/git/slp/pkgs/elementary

Conflicts:
	TC/tet_scen_arm

diff --cc TC/tet_scen_arm
index 3cee8ea,966fbb9..8eea976
--- 1/TC/tet_scen_arm
--- 2/TC/tet_scen_arm
+++ b/TC/tet_scen_arm
@@@ -43,11 -43,7 +43,9 @@@ el
        :include:/elm_ts/scrolled_entry/tslist
        :include:/elm_ts/entry/tslist
        :include:/elm_ts/dayselector/tslist
- 
- jaehwan
-       :include:/elm_ts/tickernoti/tslist
 +      :include:/elm_ts/tickernoti/tslist
+       :include:/elm_ts/transit/tslist
 +
  #yhkim
  ch 
        /telephony-framework/sim/unit/uts_tapi_verify_chv