Merge remote-tracking branch 'remotes/origin/upstream' into tizen 93/83393/1
authorSeungbae Shin <seungbae.shin@samsung.com>
Wed, 10 Aug 2016 12:05:19 +0000 (21:05 +0900)
committerSeungbae Shin <seungbae.shin@samsung.com>
Wed, 10 Aug 2016 12:05:26 +0000 (21:05 +0900)
Change-Id: Iabfd3a73744e7b1b4bcf9e53561fdd1d13aacfaa


Trivial merge