Merge branch 'tizen' into new_text 86/32386/1
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 17 Dec 2014 14:34:36 +0000 (14:34 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 17 Dec 2014 14:35:04 +0000 (14:35 +0000)
commitef92f78dcd2e38804bfaf2fbbc7d1cdcb6fd9448
treecc09ec0c35f55c245d5b5f817be60e75702ccc69
parent10e3e67dc9dfcbd3983f5d4ff9f7888e8383b2c4
parent962c0ecaccaf62124c71e4bbaad146e16c330157
Merge branch 'tizen' into new_text

Change-Id: I831cc447f71fd9381899fc7c7ad5a67a4123c441