diff options
| author | Andrei-Valentin Onea <andreionea@google.com> | 2019-03-22 06:44:40 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-22 06:44:40 -0700 |
| commit | 0ac5a31aa16df680e2dea2075ec5f5d5244190b3 (patch) | |
| tree | 3fe70bf7fa11275706ea38fd76b15b20449509d7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f81337ade404cbe3b3ff56f2fcd33564588c0b8e (diff) | |
| parent | 84256d8d0f23262b288cd45cc6e55a116046f000 (diff) | |
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 88e2a9aaee am: 02f43694e4
am: 84256d8d0f -s ours
am skip reason: change_id I9c2f8347952f3cc65759472b0e1a2717b285e44e with SHA1 e30e3928f9 is in history
Change-Id: Ibaf1e8320f8603c5eb6d33a4a4c862e9dbc2559f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions