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)
commitea3b90336cac85ca8c75e6a78a60ab16dc2ffe58
tree7e3f4eca0f89c71a23d6d28e98ad667bfd75a18f
parent30b2db59da6a03ee44cfc6e218278f8d3c6ff53e
parent042d312f286334082d9919fbc137f83aa1793d5d
Merge "Merge branch 'master' into simulator" into simulator