OSDN Git Service

resolved conflicts for merge of 35c0bf31 to ics-aah
authorJason Simmons <jsimmons@google.com>
Mon, 29 Aug 2011 23:16:49 +0000 (16:16 -0700)
committerJason Simmons <jsimmons@google.com>
Mon, 29 Aug 2011 23:16:49 +0000 (16:16 -0700)
commitca426b4bff9840b3dc3c523d893185debf487efd
tree96325ec27b509b1ef422a93aae47ae82a9655852
parent1ae9d3b64102e317fbf32584a81e8be96db8ce64
parent13e6dfbd77a6e2c2832cbfe6dc66f3db8716538b
resolved conflicts for merge of 35c0bf31 to ics-aah

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