diff options
| author | Joe Onorato <joeo@google.com> | 2010-09-16 10:56:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 10:56:30 -0700 |
| commit | 33c7a52fa4ac45e2eb6553d2a542d9609569e0d8 (patch) | |
| tree | 7ae7762e93e19b0fdd6511f03fe62609b7a14d57 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9e6f16a5d03726d2ca3f265158e3c395f0b57e63 (diff) | |
| parent | f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16 (diff) | |
am f8a93cb7: (-s ours) am 8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread
Merge commit 'f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16'
* commit 'f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16':
DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions