From: Changyeon Lee <cyeon.lee@samsung.com>
Date: Thu, 17 Apr 2014 05:39:54 +0000 (+0900)
Subject: Merge branch 'devel/upgrade' into tizen
X-Git-Tag: accepted/tizen/mobile/20140519.074853^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F19701%2F1;p=platform%2Fupstream%2Finputproto.git

Merge branch 'devel/upgrade' into tizen

Change-Id: I1346f5212bf0dc140404143482ddf0ca7e41c6e0
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>
---

36f889d951b644cce20138154230beca1a1c5f33