summaryrefslogtreecommitdiffstats
path: root/services/audioflinger
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-11-04 03:27:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-04 03:27:58 +0000
commit123a2deac738bc9c3a1cc35cd3dc7f8f91302c36 (patch)
tree07a6e5e25a57ff5ff819bc89ecd9e53ced21c8bd /services/audioflinger
parent59e67a3cd41feae61cb89be51e0505afc2df96de (diff)
parentbec72a5c63bcff1a69ea05000b772a40ca291b43 (diff)
downloadframeworks_av-123a2deac738bc9c3a1cc35cd3dc7f8f91302c36.zip
frameworks_av-123a2deac738bc9c3a1cc35cd3dc7f8f91302c36.tar.gz
frameworks_av-123a2deac738bc9c3a1cc35cd3dc7f8f91302c36.tar.bz2
am bec72a5c: am 5ae9280b: Merge "audio: fix talkback why alarm is playing" into lmp-mr1-dev automerge: 461b02d
* commit 'bec72a5c63bcff1a69ea05000b772a40ca291b43': audio: fix talkback why alarm is playing
Diffstat (limited to 'services/audioflinger')
0 files changed, 0 insertions, 0 deletions