Merge branch 'master' into simulator 99/4199/3
authorHarish Kumara Marappa <h.marappa@samsung.com>
Fri, 13 Nov 2015 07:16:35 +0000 (12:46 +0530)
committerHarish Kumara Marappa <h.marappa@samsung.com>
Fri, 13 Nov 2015 07:16:35 +0000 (12:46 +0530)
Change-Id: I562e5df3bab28694b1841f5302b677ccdae7bbc6
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>

Trivial merge