diff options
author | Jamie Gennis <jgennis@google.com> | 2011-03-18 17:36:51 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-18 17:36:51 -0700 |
commit | bd340c7b492fcf7d0a6cccab8825e710c83fe76d (patch) | |
tree | bc74a5c7e4987377ecff34d474be2cc613ffc65f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | cfb05dc67e4fd8c0c078d31bf5404ad915b80030 (diff) | |
parent | b368f4d85d8b5e567f605c991a6c5c6ff1c868d8 (diff) |
am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
* commit 'b368f4d85d8b5e567f605c991a6c5c6ff1c868d8':
SurfaceFlinger: Fix a typo.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions