tree 7cc8f8a23c5f7540a2bc35aa7cd390d9075c8920
parent f124c72600b4dede773d0fb6745fa511167cb508
parent 549c3d2e4f69dd9cd7e4d98d70269c18d74cb7e9
author Erik Kline <ek@google.com> 1504150255 +0000
committer android-build-merger <android-build-merger@google.com> 1504150255 +0000

Merge "Shutdown more reliably"
am: 549c3d2e4f

Change-Id: I9ff7e6ee49bb88f9a63b269d57d5e91ed6ddec31