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 | e3c233d1a994459969efc7b6fd0309a82ec220db (patch) | |
| tree | 031f03af99732267299954bd3ecab17ec2a7ee8f /include | |
| parent | 1a5b93a2d95106807ca069bfb5e74d6da86283ee (diff) | |
| parent | 359b3fd8d8351ac2abc3ec65f355d4fe9d5b9c31 (diff) | |
| download | frameworks_native-e3c233d1a994459969efc7b6fd0309a82ec220db.zip frameworks_native-e3c233d1a994459969efc7b6fd0309a82ec220db.tar.gz frameworks_native-e3c233d1a994459969efc7b6fd0309a82ec220db.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')
| -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; }; // --------------------------------------------------------------------------- |