diff options
| author | Eric Laurent <elaurent@google.com> | 2010-12-01 08:34:45 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2010-12-01 08:56:56 -0800 |
| commit | 9fda63ad7e4a36ccea7b52652d5bff3da3a27854 (patch) | |
| tree | 085d71f8029780a4d5016f20d5205841761b854f /libaudio/AudioPolicyManager.cpp | |
| parent | eb1281c6e8962852a498724b02f44ebfda373ac2 (diff) | |
| parent | d59093ec60e6ae046722a132023d7cf15e3d690c (diff) | |
| download | device_samsung_crespo-9fda63ad7e4a36ccea7b52652d5bff3da3a27854.zip device_samsung_crespo-9fda63ad7e4a36ccea7b52652d5bff3da3a27854.tar.gz device_samsung_crespo-9fda63ad7e4a36ccea7b52652d5bff3da3a27854.tar.bz2 | |
resolved conflicts for merge of d59093ec to master
Change-Id: Iab2b74f8eb505e3f474f2d768b1e00964c214526
Diffstat (limited to 'libaudio/AudioPolicyManager.cpp')
| -rw-r--r-- | libaudio/AudioPolicyManager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libaudio/AudioPolicyManager.cpp b/libaudio/AudioPolicyManager.cpp index 41c0fd0..c53d1e9 100644 --- a/libaudio/AudioPolicyManager.cpp +++ b/libaudio/AudioPolicyManager.cpp @@ -42,4 +42,5 @@ extern "C" void destroyAudioPolicyManager(AudioPolicyInterface *interface) delete interface; } + }; // namespace android |