summaryrefslogtreecommitdiffstats
path: root/libs/rs/rsProgramFragmentStore.h
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-06-16 12:38:55 -0700
committerMathias Agopian <mathias@google.com>2009-06-16 12:38:55 -0700
commit69f066c8fc42b9f0acc5c41f8ffd972f8d6d0584 (patch)
tree3a8bc941200fa85a32a21657ac69ec9beb9a6463 /libs/rs/rsProgramFragmentStore.h
parent151e859e0fc3a930bdf6d270d275e69e9eba0cbf (diff)
parentb0b160ae50497966666bcdcaf974eca2643acfd3 (diff)
downloadframeworks_base-69f066c8fc42b9f0acc5c41f8ffd972f8d6d0584.zip
frameworks_base-69f066c8fc42b9f0acc5c41f8ffd972f8d6d0584.tar.gz
frameworks_base-69f066c8fc42b9f0acc5c41f8ffd972f8d6d0584.tar.bz2
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'libs/rs/rsProgramFragmentStore.h')
-rw-r--r--libs/rs/rsProgramFragmentStore.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/libs/rs/rsProgramFragmentStore.h b/libs/rs/rsProgramFragmentStore.h
index bbd0f38..d862775 100644
--- a/libs/rs/rsProgramFragmentStore.h
+++ b/libs/rs/rsProgramFragmentStore.h
@@ -76,8 +76,6 @@ public:
~ProgramFragmentStoreState();
ProgramFragmentStore *mPFS;
-
-
};