diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-25 10:18:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 10:18:14 -0700 |
| commit | 44b31fdd86053945e1eeb3b91783577aebd95b55 (patch) | |
| tree | 00eea83698d9eda183235f2903cd7562cd9f8e37 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7517ffd134d03bd5392e8292a18551bfce08ddce (diff) | |
| parent | 7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758 (diff) | |
am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant
Merge commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758' into gingerbread-plus-aosp
* commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758':
Make the default backup configuration "disabled; local transport selected"
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions