OSDN Git Service

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


Trivial merge