Merge branch 'tizen' into mw
authorgreatim <jaewon81.lim@samsung.com>
Tue, 16 Sep 2014 12:02:44 +0000 (21:02 +0900)
committergreatim <jaewon81.lim@samsung.com>
Tue, 16 Sep 2014 12:02:47 +0000 (21:02 +0900)
commit31ca836077b528a9bbbaf9d2a5daae823c897d8e
tree2df69410bab8fb5e1c0d136f5382c6763f60f9e4
parent47ce7ff05656222a2ee646eb0c9f5e0bf20e28cb
parentae9a6e702be088b111c6000aee072d41abc41c4e
Merge branch 'tizen' into mw

Change-ID: I81d148d92077d28d1c83c2a2aaf67af0268ce41b