OSDN Git Service

resolved conflicts for merge of f3a892ab to ics-aah
authorEric Laurent <elaurent@google.com>
Tue, 8 Nov 2011 17:52:15 +0000 (09:52 -0800)
committerEric Laurent <elaurent@google.com>
Tue, 8 Nov 2011 17:52:15 +0000 (09:52 -0800)
commit0f31bfac8cc3317a1f96f7c2bb1cf3941c5c148c
treee9447a721f0b36132391927351643f16108eddb7
parentc0d3b9a32e04a9fe1e88097be8785d8055397232
parente1a8a719c7c62fdb337b71f68844ae20042c2b79
resolved conflicts for merge of f3a892ab to ics-aah

Change-Id: Id9c0ef089d4ed71dbf69c5969b36f9ac44a25ad3
services/audioflinger/AudioFlinger.cpp