summaryrefslogtreecommitdiffstats
path: root/drm/drmserver
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-03-15 14:10:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-15 14:10:30 -0700
commit1006c80903c4e6b0554a3bc2e3585639c395927d (patch)
treef024dd66dba1d170242cff661ad3b7035a1bbe59 /drm/drmserver
parent99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65 (diff)
parent8d2577b9ac2f95f218db59a78447efd3c6a742dd (diff)
downloadframeworks_av-1006c80903c4e6b0554a3bc2e3585639c395927d.zip
frameworks_av-1006c80903c4e6b0554a3bc2e3585639c395927d.tar.gz
frameworks_av-1006c80903c4e6b0554a3bc2e3585639c395927d.tar.bz2
Merge "Bug fixes of DRM framework."
Diffstat (limited to 'drm/drmserver')
-rw-r--r--drm/drmserver/DrmManager.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index 1eee5f2..2fee59c 100644
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -37,7 +37,6 @@
using namespace android;
-Vector<int> DrmManager::mUniqueIdVector;
const String8 DrmManager::EMPTY_STRING("");
DrmManager::DrmManager() :