diff options
| author | Joe Malin <jmalin@google.com> | 2010-10-25 16:22:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-25 16:22:46 -0700 |
| commit | 96bdc500104c3e162495a9bfcf90799467e45c3d (patch) | |
| tree | d82b196b06dd6943d6e15ff6b8e9e5cb5be66349 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b (diff) | |
| parent | 5016df1cface59b04ad59d0fef29ea32dcad8d60 (diff) | |
am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp
* commit '5016df1cface59b04ad59d0fef29ea32dcad8d60':
Doc Change: Revert NotePad sample test package
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions