summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgram.cpp
diff options
context:
space:
mode:
author Gilles Debunne <debunne@google.com> 2010-08-19 15:29:24 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-19 15:29:24 -0700
commitbbe5fb2b73172a6b42b3406354a3556bd53916e1 (patch)
treed642233d6b52303c64038964a052f54896c63ad6 /libs/rs/rsProgram.cpp
parent9a5c6e4f56e574e7591d8d3af1c2b64053df407f (diff)
parent189de2820932fd5dc98b9639fdc420a57cfa2316 (diff)
am 189de282: Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread
Merge commit '189de2820932fd5dc98b9639fdc420a57cfa2316' into gingerbread-plus-aosp * commit '189de2820932fd5dc98b9639fdc420a57cfa2316': Fix for a Resource system bug that displayed the wrong name for missing asset.
Diffstat (limited to 'libs/rs/rsProgram.cpp')
0 files changed, 0 insertions, 0 deletions