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)
commit48e1381e5de0a6421d8b7c9df2f47065f0b489c1
tree08accdaa27bcb7e9adb9f68d243a1652efe06db5
parent1779d28a01da9336728f182ec1fa3530e147180f
parent109da2417405531e38cf30f8fd43b6628747e875
Merge remote-tracking branch 'remotes/origin/upstream' into tizen

Change-Id: Iabfd3a73744e7b1b4bcf9e53561fdd1d13aacfaa