Merge branch 'tizen' into new_text 93/32393/1
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 17 Dec 2014 15:42:44 +0000 (15:42 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 17 Dec 2014 15:44:12 +0000 (15:44 +0000)
commitdd45b3917aa14e8030e3e8c7a266f46270309d77
tree1bce1e954bb717fa2415c09615016a30b0636030
parent78d022b752910e1875a7115f02058ddb29822b52
parent56e46a71ab2df59d5c8d70019b6e37a2d21b1757
Merge branch 'tizen' into new_text

Change-Id: I5e353b151f78237a7bed4706c24b8d93b7b341f4