Merge "Merge branch 'master' into simulator" into simulator
authorMadan Lanka <lanka.madan@samsung.com>
Fri, 18 Sep 2015 22:21:36 +0000 (22:21 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Fri, 18 Sep 2015 22:21:36 +0000 (22:21 +0000)

Trivial merge