tree 2c34d3a7a86776041d8709aa2dfb32072be1d446
parent 5c0b07a124722f4537922125eff08813a493695c
parent 7a93d7c3370e311358c7464be85d8cc3060310c0
author weijiaxu <weijiaxu@google.com> 1529964024 -0700
committer android-build-merger <android-build-merger@google.com> 1529964024 -0700

Merge "Add Simulator service." am: 336cc00d41
am: 7a93d7c337

Change-Id: I90831dc3ece70cad0c4ea515ae0441bcaaa5f895