OSDN Git Service

resolved conflicts for merge of 05683c85 to master
authorEric Laurent <elaurent@google.com>
Thu, 19 Jan 2012 18:00:02 +0000 (10:00 -0800)
committerEric Laurent <elaurent@google.com>
Thu, 19 Jan 2012 18:00:02 +0000 (10:00 -0800)
commitaeeb7e219e34d2d657d829913659a4e10e976375
treee8e5714af790d29647ae7080f2276bce93074075
parent27a0d83f53ddbfd6449ab0e3c786742a2cd135a9
parent9e5af59badab79128c03c79534a20f09b6e93cfe
resolved conflicts for merge of 05683c85 to master

Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d
services/audioflinger/AudioFlinger.cpp
services/audioflinger/AudioFlinger.h