diff options
| author | Dan Egnor <egnor@google.com> | 2010-05-06 17:35:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 17:35:06 -0700 |
| commit | a269d195d41ced934d2153fd81fa69ffe7854740 (patch) | |
| tree | cbfe9a5b063aa4aa860f4c2e3e26f1acde99780b /include | |
| parent | 94886d9774d11b8bc93e56103d2f0ab61458ada0 (diff) | |
| parent | ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f (diff) | |
| download | frameworks_base-a269d195d41ced934d2153fd81fa69ffe7854740.zip frameworks_base-a269d195d41ced934d2153fd81fa69ffe7854740.tar.gz frameworks_base-a269d195d41ced934d2153fd81fa69ffe7854740.tar.bz2 | |
am ca48c88c: am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit 'ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f' into kraken
* commit 'ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f':
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; }; // --------------------------------------------------------------------------- |