diff options
| author | Joe Onorato <joeo@google.com> | 2010-09-16 09:27:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 09:27:56 -0700 |
| commit | f8a93cb7b9df2d6e84940b2f8741f8fd730d4c16 (patch) | |
| tree | aba4958ef1710931351a32af49b6e198f89c84a0 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d32d30119bd0c0988a6806f1205db5426235af52 (diff) | |
| parent | 8c9eacd9b9669642b052e3349d55c6a303f54b31 (diff) | |
am 8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread
Merge commit '8c9eacd9b9669642b052e3349d55c6a303f54b31' into gingerbread-plus-aosp
* commit '8c9eacd9b9669642b052e3349d55c6a303f54b31':
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