Merge "AudioPolicyService: malloc/delete pair"

author Glenn Kasten <gkasten@android.com>

Tue, 18 Mar 2014 17:31:25 +0000 (17:31 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Tue, 18 Mar 2014 17:31:26 +0000 (17:31 +0000)
author Glenn Kasten <gkasten@android.com>
Tue, 18 Mar 2014 17:31:25 +0000 (17:31 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 18 Mar 2014 17:31:26 +0000 (17:31 +0000)
diff --cc services/audioflinger/AudioPolicyService.cpp
Simple merge
author	Glenn Kasten <gkasten@android.com>
	Tue, 18 Mar 2014 17:31:25 +0000 (17:31 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 18 Mar 2014 17:31:26 +0000 (17:31 +0000)