diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-24 09:02:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 09:02:16 -0700 |
| commit | 108ef58d9b5eaea9edaff59026c438dd0e356700 (patch) | |
| tree | 39294940cac1d3ea8676d9055790b2c60be315a6 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 608dbbe76fdd4d8313b8439b6ea744c9ea67d927 (diff) | |
| parent | c5794ae72547cce6cbae1e58df5d32bc0e2520fd (diff) | |
am c5794ae7: (-s ours) am baf72cd7: Merge "DO NOT MERGE 2928156 Accessibility event\'s parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread
Merge commit 'c5794ae72547cce6cbae1e58df5d32bc0e2520fd'
* commit 'c5794ae72547cce6cbae1e58df5d32bc0e2520fd':
DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions