Merge branch 'simulator' 63/4663/1
authorG S Senthil Kumar <senthil.gs@samsung.com>
Fri, 18 Dec 2015 13:44:30 +0000 (19:14 +0530)
committerG S Senthil Kumar <senthil.gs@samsung.com>
Fri, 18 Dec 2015 13:44:30 +0000 (19:14 +0530)
Change-Id: Iee9352bd3bf67c5db6aa07f0ea10639b180bfedc
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>

Trivial merge