summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramFragment.cpp
diff options
context:
space:
mode:
author Trevor Johns <trevorjohns@google.com> 2010-01-11 14:05:55 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-11 14:05:55 -0800
commit18dedf2cdfd2c78d93061f20c4269f00449a8e6a (patch)
treef6e3e0c83b3fbca5f0c237cbdce1996e907a6ffd /libs/rs/rsProgramFragment.cpp
parent6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9 (diff)
parent50a3977c619be113bb35fb7fd53874effad6dbe4 (diff)
am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp * commit '50a3977c619be113bb35fb7fd53874effad6dbe4': Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Diffstat (limited to 'libs/rs/rsProgramFragment.cpp')
0 files changed, 0 insertions, 0 deletions