samsung version center display
Merge branch 'daliots-local-test'
add master ui for samsung city