diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-06-21 14:44:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-21 14:44:13 -0700 |
| commit | e8898d4a4441b590c3c6e6336cfbb53fcd853775 (patch) | |
| tree | 52c06f5236bd16c9094bdc33e26b5538bae5e52c /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f50ef6a43d721e933fd596113f8ae6644b29f3f5 (diff) | |
| parent | 885c3c11cf1e20c456ddf681a06a4a878426a632 (diff) | |
am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
* commit '885c3c11cf1e20c456ddf681a06a4a878426a632':
DO NOT MERGE Revert "Fix lease duration handling"
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions