OSDN Git Service

am 968fc3ab: Merge "Fix deadlock." into mnc-dev
authorCarlos Valdivia <carlosvaldivia@google.com>
Wed, 12 Aug 2015 01:47:42 +0000 (01:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Aug 2015 01:47:42 +0000 (01:47 +0000)
* commit '968fc3ab75b0de71f298c6241cab1be1e6d5c86e':
  Fix deadlock.


Trivial merge