Merge branch 'private-develop' into develop
authorsungmin ha <sungmin82.ha@samsung.com>
Fri, 10 Aug 2012 10:24:22 +0000 (19:24 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Fri, 10 Aug 2012 10:24:22 +0000 (19:24 +0900)
commit4b4c0e014c31a4c11880460faf4e3fb1da44aa85
treef64890728acbb703fbedb404cc3d5c12c842c410
parent912dcfc72fad129cb00ef957fd23ee34688315e2
parent1f504af23cf5587f1b626f261f1ddfbc510f71ae
Merge branch 'private-develop' into develop

Conflicts:
org.tizen.device/src/org/tizen/device/sdcard/page/SdcardPage.java
org.tizen.location.map/src/org/tizen/location/map/page/MapImage.java
org.tizen.telephony.call/src/org/tizen/telephony/call/page/MOMTCall.java
package/build.linux
package/pkginfo.manifest