Merge branch 'new_text' into tizen 25/38025/1
authorPaul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 15:48:58 +0000 (16:48 +0100)
committerPaul Wisbey <p.wisbey@samsung.com>
Thu, 9 Apr 2015 15:49:28 +0000 (16:49 +0100)
commitc93722c1550a92fb60b19fa8582cadb0ce43eec9
treeffb9d0a7f3c53f77d11a70c758476100fcae15a3
parent181efc47ccdf2a0dcb481a2d5597df11cd089c43
parent00918750a1a86fdb8a1feea0518f54c54fc084e0
Merge branch 'new_text' into tizen

Change-Id: I845577c7ed3878dd1f22718f395afe86acd55863