OSDN Git Service

am 6d4d8790: am b687ff9f: Merge "Fix mismatched delete/new couple"
authorGlenn Kasten <gkasten@android.com>
Thu, 1 Aug 2013 19:47:14 +0000 (12:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Aug 2013 19:47:14 +0000 (12:47 -0700)
* commit '6d4d879037a495f9a4276a6996d1845594ce9090':
  Fix mismatched delete/new couple

1  2 
services/audioflinger/Threads.cpp

Simple merge