Merge "Merge branch 'simulator'."
authorMadan Lanka <lanka.madan@samsung.com>
Mon, 7 Mar 2016 14:20:09 +0000 (14:20 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Mon, 7 Mar 2016 14:20:09 +0000 (14:20 +0000)

Trivial merge