OSDN Git Service

Merge ee4618bc
authorJean-Baptiste Queru <jbq@google.com>
Fri, 20 Jan 2012 01:18:25 +0000 (17:18 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 20 Jan 2012 01:18:25 +0000 (17:18 -0800)
commitca05a87f4c69670a06bdee4b4f98bcdcd838beda
tree2b8556647f7fa9b8fd3c9355cda3bb26779bf725
parent90a607163f793b968d96295b876532e4d03b642c
parent3812256de32e73e38ba16e50ac0451c10223d4eb
Merge ee4618bc

Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
media/libstagefright/AwesomePlayer.cpp
services/audioflinger/AudioFlinger.cpp
services/audioflinger/AudioMixer.cpp