diff options
| author | Mathias Agopian <mathias@google.com> | 2011-06-16 17:15:51 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2011-06-16 17:22:28 -0700 |
| commit | e7d3ee9d81de13e992c7d063ca472d480956b0c6 (patch) | |
| tree | ccc17e58c35296b985c69a0319f8ec23981cf928 /include | |
| parent | c826f92e6f90f4157afd4ed69c6907ff768a0d6b (diff) | |
| download | frameworks_base-e7d3ee9d81de13e992c7d063ca472d480956b0c6.zip frameworks_base-e7d3ee9d81de13e992c7d063ca472d480956b0c6.tar.gz frameworks_base-e7d3ee9d81de13e992c7d063ca472d480956b0c6.tar.bz2 | |
Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
Also revert all dependent changes:
This reverts commit 8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit 69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit 2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit 24855c09173a6caaec7dcedd0c2d7ce15121d39b.
Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/RefBase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/utils/RefBase.h b/include/utils/RefBase.h index b31e993..f355087 100644 --- a/include/utils/RefBase.h +++ b/include/utils/RefBase.h @@ -120,7 +120,7 @@ public: protected: RefBase(); virtual ~RefBase(); - + //! Flags for extendObjectLifetime() enum { OBJECT_LIFETIME_WEAK = 0x0001, |