tree 7e5ead57f6d67191791ba25704bd927e8de52d15
parent 472d796ab2bb094fd587237292af718168fa787c
parent 2fd5af103609594f021e2d7d068df79c43d63d5a
author Tetsutoki Shiozawa <tetsutoki.shiozawa@sony.com> 1519630998 +0000
committer android-build-merger <android-build-merger@google.com> 1519630998 +0000

Merge "Definitely abort reconnecting to native daemon during shutdown"
am: 2fd5af1036

Change-Id: I42d34accd9b56d1090a76632751447653cc8dd61