diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-20 15:45:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-20 15:45:09 -0700 |
| commit | 5a14271aacb932ba0d52978c939f74e4c685f7d6 (patch) | |
| tree | ac9e2e9bed2f97bcf4479be7e46600bae3e01d70 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 485de781f6bd30dfb7aa1e55c4f1efb3d3b11eba (diff) | |
| parent | d6f7f225689ecd33dc54699acc01cfafc781c20d (diff) | |
am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread
Merge commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d' into gingerbread-plus-aosp
* commit 'd6f7f225689ecd33dc54699acc01cfafc781c20d':
Load bitmaps in the correct format.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions