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)
commit1d22cff71dc61544eadadb13037995a6f13bb6f0
treed8ba4315427ee2e581f896e66d9775fb9ddcee2b
parentbfcc1747191e026159bbbd9d50692da22c442500
parenta29c54ef36ae8b0ea7769604aabd5851a2103d33
Merge "Merge branch 'simulator'."