diff options
| author | Andrei-Valentin Onea <andreionea@google.com> | 2019-03-07 02:50:51 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-07 02:50:51 -0800 |
| commit | 9a3ebed84247f1780b5d2b2170f5fdb496dcdd67 (patch) | |
| tree | 82c662bd8b3100b3cb787a33dbd263ca078936ac /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0a68a093b23132def6bd33f2a33b0c507c1f6fe9 (diff) | |
| parent | 918fd7934bbac6f9a73c0bc58b514bbd0db6c4ca (diff) | |
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 722dff1f35 am: 7b577b39f7
am: 918fd7934b -s ours
am skip reason: change_id I1c8ae08f8d3b4b2f5bf365468f22155f8def09fe with SHA1 4aa2a2015b is in history
Change-Id: Ia68e0228114befa12c92159aff98c99b1a54ac0c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions