OSDN Git Service

resolved conflicts for merge of 930fe98b to master
authorEric Laurent <elaurent@google.com>
Tue, 20 Jul 2010 19:23:58 +0000 (12:23 -0700)
committerEric Laurent <elaurent@google.com>
Tue, 20 Jul 2010 19:23:58 +0000 (12:23 -0700)
commit3be78bce2b78d059cb1325367f43873fb3be775a
tree69bd09e76ea119700bd3d1727803086861555373
parent7fbf4515ec1b315264ab86b05eaafb4c154ecd3e
parent930fe98bbe3486dbd587768ff5c8f1913bb58327
resolved conflicts for merge of 930fe98b to master

Change-Id: Ib6ab3b02aede7e07b71e19b16d305919be849bdd
include/hardware_legacy/AudioPolicyManagerBase.h