OSDN Git Service

resolved conflicts for merge of b52c152d to master
authorEric Laurent <elaurent@google.com>
Sat, 31 May 2014 01:51:48 +0000 (18:51 -0700)
committerEric Laurent <elaurent@google.com>
Sat, 31 May 2014 01:53:14 +0000 (18:53 -0700)
commit72aa32f7dbbfb658097930b57659d8e50f24a953
tree7033c38865bfdb413c5ca891fd4f6d0a98a84d99
parentcf570853ee36eeb58be38ea3dac16a17c6a5d4ba
parentb52c152d553556b2d227ffc943489de0c60b4b02
resolved conflicts for merge of b52c152d to master

Change-Id: I34869bda071d511c9595ea0a5ff6571eb34da059
services/audiopolicy/AudioPolicyManager.cpp