diff options
| author | Jason Parks <jparks@google.com> | 2010-07-08 19:10:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-08 19:10:10 -0700 |
| commit | 2a57917a5cc10cbfea9a2f7ed7b040ce80c6705b (patch) | |
| tree | b0ba96a3cd62f11d205a037fef93fa6f6bd60575 /graphics/java/android/renderscript/ProgramRaster.java | |
| parent | ac85b829f6ec841e80d29e05b836da4c88b4644c (diff) | |
| parent | 49ff1e6c6c857e1a596fa0b75faaaf17cae08621 (diff) | |
am 49ff1e6c: am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread
Merge commit '49ff1e6c6c857e1a596fa0b75faaaf17cae08621'
* commit '49ff1e6c6c857e1a596fa0b75faaaf17cae08621':
Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramRaster.java')
0 files changed, 0 insertions, 0 deletions