Merge branch 'tizen' into new_text 99/32599/1
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 19 Dec 2014 10:02:41 +0000 (10:02 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Fri, 19 Dec 2014 10:03:21 +0000 (10:03 +0000)
commit6ed1b97d83ae8a2b6fc3fa1b0b6046cc2902718e
tree05c94776bc017ce9db4914a9e13e654fa61ea94b
parent4b8061d6fd92468282711df0425ce35123c97a2f
parentd93de7784b5186017ff6980af88604c78d5aa02e
Merge branch 'tizen' into new_text

Change-Id: I465251a37a21be084091c48dbf0b1b4b94ccceaf