diff options
| author | Ian Rogers <irogers@google.com> | 2013-04-23 15:01:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-23 15:01:30 -0700 |
| commit | 023c1f4a1e94ae93a4ab4578ea87a0c26eb83667 (patch) | |
| tree | f7f96c960488325e71a8aca063918c9906c874c3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7aea41b3d63f5ef5a258323e9fc1e8b0e8fbaf59 (diff) | |
| parent | 896ee5b6f8354567464a371025088156ed49bc32 (diff) | |
am 896ee5b6: am be4536d2: Merge "Adding matching @deprecated."
* commit '896ee5b6f8354567464a371025088156ed49bc32':
Adding matching @deprecated.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions