OSDN Git Service

am c1d26429: am 39ce2282: Merge "Only detach shutdown thread if we attached it"
authorMathieu Chartier <mathieuc@google.com>
Tue, 24 Feb 2015 00:46:51 +0000 (00:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Feb 2015 00:46:51 +0000 (00:46 +0000)
* commit 'c1d26429caf24df1e1811d99a6379979fc1596e0':
  Only detach shutdown thread if we attached it


Trivial merge