Merge branch 'tizen' into new_text 84/32384/1
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 17 Dec 2014 14:30:30 +0000 (14:30 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 17 Dec 2014 14:31:06 +0000 (14:31 +0000)
commitb8c93847cc736bfc69876fd087ab06474fbfbe47
tree636d6f7b81ab43a65afa85d6cee6011ef4c138a8
parentbbb84f1c666429f3c1be6519cc903f27cefec96c
parent4ccfc72faa9b5a28ee71ffe4696b324fb5b372db
Merge branch 'tizen' into new_text

Change-Id: I56c3eea20ba2a50052d63ca4b221fe6dd6183d1f