diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-08-27 15:52:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-27 15:52:56 -0700 |
| commit | c026d5cf2fde3006d05bf7fa8b2f61e61afc1d95 (patch) | |
| tree | c5e2c8a91936ad01a43ca2e5cd42562bb1d27040 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bfa6d1dbe495fcf4f74f1995d54ec191e6671b5c (diff) | |
| parent | 603a1f59703109c89ec0fdeceb0f8d28c7cede22 (diff) | |
am 603a1f59: am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread
Merge commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22'
* commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22':
Fix some bugs in SettingsProvider that I introduced the other day.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions