OSDN Git Service

resolved conflicts for merge of 75402fdb to master
authorColin Cross <ccross@android.com>
Thu, 24 Apr 2014 15:39:41 +0000 (08:39 -0700)
committerColin Cross <ccross@android.com>
Thu, 24 Apr 2014 15:39:41 +0000 (08:39 -0700)
commitb10621c1f15d7b57d1ecf15efea6cd00f593dadc
tree4ade65312da54aba350d1ed477da1c5ae54e519d
parenta75f4ba5c2b98d5ccf7cab5196ce43a798acd1d4
parent75402fdbdd0bb9de19370eb19c3a669c6d730898
resolved conflicts for merge of 75402fdb to master

Change-Id: Ie85a3c7d498d7685738190267916e9a205cc469e
audio/AudioPolicyManagerBase.cpp