diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-06-23 07:48:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-23 07:48:38 -0700 |
| commit | e35446e8f47ffec9723666941f6d0a82d5d0a5fd (patch) | |
| tree | afcc960be2dedae2c28d8a7f51f59da58e922eb7 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6839550fd9e32f7477a4d962e37c9a9a41ddd359 (diff) | |
| parent | e8898d4a4441b590c3c6e6336cfbb53fcd853775 (diff) | |
am e8898d4a: (-s ours) am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
* commit 'e8898d4a4441b590c3c6e6336cfbb53fcd853775':
DO NOT MERGE Revert "Fix lease duration handling"
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions