diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-05-25 14:42:20 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-25 14:42:20 -0700 |
commit | 8e5799ed16ab605d8de775e1644f1fa59ff6627e (patch) | |
tree | cc7f1fd4b865123a2ee50ddebd628004e186112f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7d0fb57044576fd4bbaf9683997bab288c3b759c (diff) | |
parent | af685f3bb566f297deee1615d55d4f33d5580ba3 (diff) |
am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
* commit 'af685f3bb566f297deee1615d55d4f33d5580ba3':
Refactor how timeouts are calculated. (DO NOT MERGE)
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions