tree 1a72193aa718a93f6b95b82fdfb6ffd799adb2a9
parent 3b0a884381c1576f64dfbdda22227a1850331a6c
parent 2a8605b9d16d822972b37b267fa11e3e9b9d5636
author Keun-young Park <keunyoung@google.com> 1489546600 +0000
committer android-build-merger <android-build-merger@google.com> 1489546600 +0000

Merge "make shutdown safe for double calls." am: 71fa1068de am: 2f93c657f4
am: 2a8605b9d1

Change-Id: Id1cd83d307e7791359bc6dfd96368f1138ff21d2