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)
Change-Id: I9312c36014032a1b5b379d2fa24fe2d313439e25
Signed-off-by: Vineeth TM <vineeth.tm@samsung.com>

Trivial merge