diff options
author | Scott Main <smain@google.com> | 2010-06-23 10:08:45 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-23 10:08:45 -0700 |
commit | a5bd886af3fe6ead846228f20b185365f17a70c6 (patch) | |
tree | 5667af9ad4de0a121fb1e60d82dac71396cb0c43 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | dd1880ee5bea09e9d37c6db29ef20e49d619c094 (diff) | |
parent | 753e56090ed5acc0d2173a8e9ab1a9b96528720b (diff) |
am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into froyo-plus-aosp
* commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b':
docs: update backup dev guide with Android Backup Service registration info
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions