Merge upstream version 5.1.2 from branch 'upstream' into tizen 02/59502/1
authorVineeth TM <vineeth.tm@samsung.com>
Tue, 16 Feb 2016 06:13:04 +0000 (15:13 +0900)
committerVineeth TM <vineeth.tm@samsung.com>
Tue, 16 Feb 2016 06:14:02 +0000 (15:14 +0900)
Change-Id: I35b8e8d1edde05386944baabc40717ce88a01e32


Trivial merge