Merge remote-tracking branch 'origin/tizen' into new_text 13/36313/1
authorPaul Wisbey <p.wisbey@samsung.com>
Wed, 4 Mar 2015 19:25:19 +0000 (19:25 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Wed, 4 Mar 2015 19:26:16 +0000 (19:26 +0000)
commit9709e1327f6ca9391863eb6dacf562334a5d6a23
tree94e2513d30ea3d1ccedb0541fa2dcd1c508a73cc
parentb3355d3e24c02b29c0ffd6d98c996cf45946d276
parent0566b362eab7867ad0ea83f52053c6fef214e7f7
Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: I33e5df93b492f44adf18e4d605ffb155c14ac024