diff options
| author | Doug Zongker <dougz@android.com> | 2010-09-21 11:41:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 11:41:11 -0700 |
| commit | 0470949554faca4d7bb67b3b47e65ccc04c5194e (patch) | |
| tree | a0c407def1c22982b5686b2c4bec20df8f42cb59 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4d76d0b8329707a0b71c6e6ff04ed47e93d5582c (diff) | |
| parent | bd1578fb682ea9dbbab10f88165a9edf72e8b063 (diff) | |
am bd1578fb: (-s ours) am eb4d5b25: Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread
Merge commit 'bd1578fb682ea9dbbab10f88165a9edf72e8b063'
* commit 'bd1578fb682ea9dbbab10f88165a9edf72e8b063':
recovery just takes a filename as an argument now (do not merge)
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions