summaryrefslogtreecommitdiff
path: root/libs/rs/rsObjectBase.cpp
diff options
context:
space:
mode:
author Dan Egnor <egnor@google.com> 2010-07-20 13:59:43 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-20 13:59:43 -0700
commit3c1363beec9c142c062d8704b8bef4230b42eae5 (patch)
treee92a0ff1fff5f96c61f2d5cbbc43c973953e118f /libs/rs/rsObjectBase.cpp
parent60a200617791cf4dd3660c514ac6bf17dfcb85de (diff)
parent2f0dc6d9f50ceece294e9db393583e655d3bf781 (diff)
am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread * commit '2f0dc6d9f50ceece294e9db393583e655d3bf781': COMMENT ONLY change to add some warnings about ParcelFileDescriptor
Diffstat (limited to 'libs/rs/rsObjectBase.cpp')
0 files changed, 0 insertions, 0 deletions