OSDN Git Service

am 74ecc15d: am 0ca15144: am 9bb76544: fix NPE in shutdown thread
authorGuang Zhu <guangzhu@google.com>
Mon, 1 Jun 2015 15:44:42 +0000 (15:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:44:42 +0000 (15:44 +0000)
* commit '74ecc15db923fdc8c94ac156aa1b6c923173b50a':
  fix NPE in shutdown thread


Trivial merge