diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 12:22:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 12:22:58 +0000 |
| commit | 85597ef79711c5a9e77c281a90006a475b4b8816 (patch) | |
| tree | 8a0345e22f941bef3f1cff177865c629680cb2e2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 67c9729b65c3685e45a7e563de5b8acc6eb4fdbe (diff) | |
| parent | b91616178e96f3ae2a768183625238a8d732d6fc (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06 am: a9c08f4361 am: b2e6bdfcdb -s ours am: 1411e29a3e -s ours am: b91616178e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232
Change-Id: I95878fd9015adafe1225a214bde6c3148b97f5c3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions