diff options
| author | Dan Egnor <egnor@google.com> | 2010-05-06 17:33:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 17:33:45 -0700 |
| commit | ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f (patch) | |
| tree | ba82e7825548f05c8ac87f75adebcf6bf6a92bf9 /include/binder | |
| parent | ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd (diff) | |
| parent | 8a8658a5de261c2da72d431940877bd054bc9837 (diff) | |
| download | frameworks_base-ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f.zip frameworks_base-ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f.tar.gz frameworks_base-ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f.tar.bz2 | |
am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit '8a8658a5de261c2da72d431940877bd054bc9837' into froyo-plus-aosp
* commit '8a8658a5de261c2da72d431940877bd054bc9837':
Make static versions of libutils and libbinder.
Diffstat (limited to 'include/binder')
| -rw-r--r-- | include/binder/Binder.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/binder/Binder.h b/include/binder/Binder.h index 47b2bb9..ba3ac4b 100644 --- a/include/binder/Binder.h +++ b/include/binder/Binder.h @@ -71,7 +71,6 @@ private: Extras* mExtras; void* mReserved0; - static String16 sEmptyDescriptor; }; // --------------------------------------------------------------------------- |