OSDN Git Service

am c6bed216: am a3b97ad2: Merge "audioflinger: implement getTimestamp() for offloaded...
authorEric Laurent <elaurent@google.com>
Fri, 20 Sep 2013 18:22:17 +0000 (11:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Sep 2013 18:22:17 +0000 (11:22 -0700)
* commit 'c6bed216e3a759a855ac4b9b743fbaed2d5929c1':
  audioflinger: implement getTimestamp() for offloaded tracks

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

Simple merge
Simple merge
Simple merge