diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 12:28:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 12:28:51 +0000 |
| commit | 53e36247a95d44e394d606b10ded70f5f873adf1 (patch) | |
| tree | 82b8c921b8d78d4be58e276e0438531e01b163c3 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | c53f9fcddf2ad916d16e910f89e183a1ee697e59 (diff) | |
| parent | 85597ef79711c5a9e77c281a90006a475b4b8816 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06 am: a9c08f4361 am: b2e6bdfcdb -s ours am: 1411e29a3e -s ours am: b91616178e am: 85597ef797 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232
Change-Id: Icc723ca81147b1c9eccbb3a2188a79c7cf216fa4
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions