Merge branch 'upstream' into tizen 61/50561/1
authorBoram Park <boram1288.park@samsung.com>
Fri, 30 Oct 2015 01:48:10 +0000 (10:48 +0900)
committerBoram Park <boram1288.park@samsung.com>
Fri, 30 Oct 2015 01:48:29 +0000 (10:48 +0900)
commit280b1fbb1b62a541563b515c1f11b0f5df3ba758
tree4336847a7f31b3fc564ef862c872addf06da997b
parent70b203f3d8c70dc590e3619221c58626f851700b
parent3b3aed811be96e73da24e3efdcfb033ea40d8c5a
Merge branch 'upstream' into tizen

Change-Id: I9d2b19a737f081312ed8ea913e8e42d006522128