summaryrefslogtreecommitdiff
path: root/libs/rs/rsObjectBase.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-06-23 13:23:24 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-23 13:23:24 -0700
commit230f5c1cfb898430c12eee40b8321385bc495e9c (patch)
tree1de3e456cfa641459c75a5b263ec8a4ab7d86806 /libs/rs/rsObjectBase.cpp
parent565879dc8655f37a0f55e59c98c5cad6314a9c4b (diff)
parent03e90f7eeb032c981fc2952aa33f6ba1fae20d97 (diff)
am 03e90f7e: am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
Merge commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97' * commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97': Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
Diffstat (limited to 'libs/rs/rsObjectBase.cpp')
0 files changed, 0 insertions, 0 deletions