diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2011-01-12 20:48:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-12 20:48:51 -0800 |
| commit | f683a357ee74f1bdd14ebdbac83c10d472386d71 (patch) | |
| tree | 84e84325a9970d55b52b6fb6218238139bed3807 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ba035dd049c345e2041e86e262d03940f0bb2699 (diff) | |
| parent | 471de1f5b3cc629739d8315ff195d6af928e7ae4 (diff) | |
am 471de1f5: (-s ours) am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
* commit '471de1f5b3cc629739d8315ff195d6af928e7ae4':
DO NOT MERGE: Remove auto connection on ACL connection.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions