OSDN Git Service

am 8580679e: am 014e7fa2: Make Audio wakelock names less unique.
authorNarayan Kamath <narayan@google.com>
Tue, 15 Oct 2013 12:05:01 +0000 (05:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Oct 2013 12:05:01 +0000 (05:05 -0700)
* commit '8580679e1780617d978d28a43e932314b86608ce':
  Make Audio wakelock names less unique.

1  2 
services/audioflinger/Threads.cpp
services/audioflinger/Threads.h

Simple merge
Simple merge