diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-14 11:56:39 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-03-14 11:56:39 -0700 |
| commit | 1825ce2475d4cbed336ddb779ab5acb09d9a155c (patch) | |
| tree | 229089e703ee58a77790038ac5de28a3e0581296 /include/drm | |
| parent | 8b9a9067511efca72ca872d689e30315c1450f94 (diff) | |
| parent | 6cfa41f06fc6a85ebaf5b94c4602128359587473 (diff) | |
| download | frameworks_av-1825ce2475d4cbed336ddb779ab5acb09d9a155c.zip frameworks_av-1825ce2475d4cbed336ddb779ab5acb09d9a155c.tar.gz frameworks_av-1825ce2475d4cbed336ddb779ab5acb09d9a155c.tar.bz2 | |
resolved conflicts for merge of c761a80d to master
Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/DrmManagerClient.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/drm/DrmManagerClient.h b/include/drm/DrmManagerClient.h index 044ff0e..5011137 100644 --- a/include/drm/DrmManagerClient.h +++ b/include/drm/DrmManagerClient.h @@ -368,7 +368,6 @@ public: private: int mUniqueId; - Mutex mDecryptLock; DrmManagerClientImpl* mDrmManagerClientImpl; }; |