Merge branch 'develop' into release-1.0
authorsungmin ha <sungmin82.ha@samsung.com>
Mon, 9 Apr 2012 08:28:03 +0000 (17:28 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Mon, 9 Apr 2012 08:28:03 +0000 (17:28 +0900)
commiteed1d54de73034d6d74b013d10851de35d3e2dc2
treef2ee8b3832c58976cccba49005edd4f23c84bd28
parentea420703393d3a5fe34712be692ef7525f50f170
parent985d2d003aa033e71083adc234b501970cac3db4
Merge branch 'develop' into release-1.0

Conflicts:
org.tizen.sensor.light/src/org/tizen/sensor/light/page/LightPage.java