diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-05-26 11:38:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-26 11:38:48 -0700 |
| commit | 3d46889f89ea0b1f217d1a124b322b5f0cd63e6b (patch) | |
| tree | bf042c61fe71a52fab2883a5aee00630e2417493 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 15291c6f55a466b296785dde28b4a38699eed5e7 (diff) | |
| parent | 8e5799ed16ab605d8de775e1644f1fa59ff6627e (diff) | |
am 8e5799ed: (-s ours) am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
* commit '8e5799ed16ab605d8de775e1644f1fa59ff6627e':
Refactor how timeouts are calculated. (DO NOT MERGE)
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions