Merge "Merge branch 'tizen' into devel/new_mesh" into devel/new_mesh
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 9 Jun 2015 09:50:57 +0000 (02:50 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 9 Jun 2015 09:50:58 +0000 (02:50 -0700)

Trivial merge