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)
Change-Id: I9d2b19a737f081312ed8ea913e8e42d006522128


Trivial merge