commit 9c2e665bc92059b2f36273ee7bf3dc9e672ec39e
author James Dong <jdong@google.com> Thu Jan 13 10:29:12 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 13 10:29:12 2011 -0800
tree 55d872d2a8d80b6d32ecd3aa72ac66e803723cc1
parent 937c34cbe5cfeb26a10ef56dd94a1108137f9e80
parent 641f3f4778ed52c4225ced1eb3ee59cb3ee72a67

am 089971ea: am c14b10c3: Merge "Add audio encoding parameters check" into honeycomb

* commit '089971eaba92225aadec21d55d028df7948df012':
  Add audio encoding parameters check

drm/drmserver/DrmManager.cpp

diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index b6e0c30..ef7d274 100644
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -87,7 +87,7 @@
 }
 
 status_t DrmManager::loadPlugIns() {
-    String8 pluginDirPath("/system/lib/drm/plugins/native");
+    String8 pluginDirPath("/system/lib/drm");
     return loadPlugIns(pluginDirPath);
 }