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 | 09ba5cebb2cbfbc1f5705b22796ebdf895d91db4 (patch) | |
| tree | a5e84f720d5e51c7c3f5901261620b412a54d635 /include/drm | |
| parent | 6f3a75e13b86a3f40fe34e3ebd17b118791a73a4 (diff) | |
| parent | c761a80df372a7f7e70ceeb2902089c53ff980f2 (diff) | |
| download | frameworks_base-09ba5cebb2cbfbc1f5705b22796ebdf895d91db4.zip frameworks_base-09ba5cebb2cbfbc1f5705b22796ebdf895d91db4.tar.gz frameworks_base-09ba5cebb2cbfbc1f5705b22796ebdf895d91db4.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; }; |