fix merge conflict
authorwoojin <woojin2.jung@samsung.com>
Fri, 11 Sep 2015 05:32:35 +0000 (14:32 +0900)
committerwoojin <woojin2.jung@samsung.com>
Fri, 11 Sep 2015 05:32:35 +0000 (14:32 +0900)
commit2f88e765c9d26a106f84fc05d24627717a7c88b5
tree75fb24dc1c8341c207380d88f6a0f9282dd77ea4
parenta180dc4ed693688ddbdbc405357d7bfacac34418
parent2f01a62ca208bd9653dd0a413693b8277d745c5b
fix merge conflict

Change-Id: I3f1e1f04a2c76fb6e9c1e7851f2cf5491fd9243f
Signed-off-by: woojin <woojin2.jung@samsung.com>
package/pkginfo.manifest