diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-03-15 13:51:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 13:51:17 -0700 |
| commit | 99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65 (patch) | |
| tree | e9354fa75ca308c682ed41c30a258866c4466ee4 /drm/drmserver/Android.mk | |
| parent | f1e10e8ed74cac805d601139882378a1f450fe94 (diff) | |
| parent | e24faedc6bc34d2ef7bc7bae64b6b20ccaf8b97d (diff) | |
| download | frameworks_av-99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65.zip frameworks_av-99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65.tar.gz frameworks_av-99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65.tar.bz2 | |
am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
* commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d':
Bug 4016329 do full string comparisons
Diffstat (limited to 'drm/drmserver/Android.mk')
| -rw-r--r-- | drm/drmserver/Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drm/drmserver/Android.mk b/drm/drmserver/Android.mk index b5ad147..e3cd44f 100644 --- a/drm/drmserver/Android.mk +++ b/drm/drmserver/Android.mk @@ -19,8 +19,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ main_drmserver.cpp \ DrmManager.cpp \ - DrmManagerService.cpp \ - StringTokenizer.cpp + DrmManagerService.cpp LOCAL_SHARED_LIBRARIES := \ libmedia \ |