Merge Upstream version 1.6.21 from branch 'upstream' into tizen 60/59260/1
authorVineeth TM <vineeth.tm@samsung.com>
Fri, 12 Feb 2016 02:27:56 +0000 (11:27 +0900)
committerVineeth TM <vineeth.tm@samsung.com>
Fri, 12 Feb 2016 02:28:24 +0000 (11:28 +0900)
commit1cf3fed6900cf55d491a9fc4f9eae1088183d3fe
tree26c09229050f478d58f67c48759df08adbf9c51e
parentfa9fc94419bb18232387fd0872a6a88c2a78453f
parent7b7ccdda02217a442f273ef9684706ecdef2acc5
Merge Upstream version 1.6.21 from branch 'upstream' into tizen

Change-Id: I9312c36014032a1b5b379d2fa24fe2d313439e25
Signed-off-by: Vineeth TM <vineeth.tm@samsung.com>