summaryrefslogtreecommitdiff
path: root/libs/rs/rsObjectBase.cpp
diff options
context:
space:
mode:
author Joe Malin <jmalin@google.com> 2010-10-25 16:27:15 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-25 16:27:15 -0700
commit39f3e380fe6422ab25ecd04ce628df0d3e799e1f (patch)
tree607de75e71dcc3f0f2de163df37d6bad336acbef /libs/rs/rsObjectBase.cpp
parentf51964f64fa043643aa1f107fd93c566e814e29c (diff)
parent96bdc500104c3e162495a9bfcf90799467e45c3d (diff)
am 96bdc500: am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Merge commit '96bdc500104c3e162495a9bfcf90799467e45c3d' * commit '96bdc500104c3e162495a9bfcf90799467e45c3d': Doc Change: Revert NotePad sample test package
Diffstat (limited to 'libs/rs/rsObjectBase.cpp')
0 files changed, 0 insertions, 0 deletions