summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-03-07 21:14:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 21:14:51 +0000
commit4ee774f322ad3292fcfbb3c120cf250643419425 (patch)
tree207b8891e48745fc85b2ddecc060acab0e1bb8e6 /include
parent4293011df9caa1c5dce0f02d7a6d35e702bdfef4 (diff)
parent2f55c2c03b17795e94b325d402ac5b409e3ba0e8 (diff)
downloadframeworks_av-4ee774f322ad3292fcfbb3c120cf250643419425.zip
frameworks_av-4ee774f322ad3292fcfbb3c120cf250643419425.tar.gz
frameworks_av-4ee774f322ad3292fcfbb3c120cf250643419425.tar.bz2
am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev
* commit '2f55c2c03b17795e94b325d402ac5b409e3ba0e8': Simplify AudioTrack stream end and fix race
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions