Merge remote-tracking branch 'mw' into tizen 98/22598/1
authorjungwook.ryu <jungwook.ryu@samsung.com>
Mon, 9 Jun 2014 07:06:16 +0000 (16:06 +0900)
committerjungwook.ryu <jungwook.ryu@samsung.com>
Mon, 9 Jun 2014 07:08:45 +0000 (16:08 +0900)
commit531ff2da40073e7e140dc6788f958d17a3ccbac7
treee53a634967994244f443283caa10b8326291c6f6
parentb611924b6e65890d4c9b1757e964548f4ae7fddb
parenta63050dfc56b66d0ebe8fc58e5cddc6262806a67
Merge remote-tracking branch 'mw' into tizen

Conflicts:
package/changelog
package/pkginfo.manifest

Change-Id: I019965fe0d64f9add440b6b983fbccec19c11b94
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>