Merge ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox/data-provider-master...
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 5 Jan 2015 02:49:51 +0000 (11:49 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 5 Jan 2015 02:50:01 +0000 (11:50 +0900)
Change-Id: Ib6e85dea4955e765d27ea467a99f34832ed23846


Trivial merge