Merge remote-tracking branch 'origin/tizen' into devel/new_mesh 82/38782/1
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 27 Apr 2015 14:48:47 +0000 (15:48 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Tue, 28 Apr 2015 10:35:23 +0000 (11:35 +0100)
Change-Id: Ic5d6300c82f8984f21dd14f4355ef6f8a36ff4cc

1  2 
adaptors/common/indicator-impl.cpp

Simple merge