diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 13:06:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 13:06:21 +0000 |
| commit | 0f6480723178fa822c2a1f01fbd872aa864d4190 (patch) | |
| tree | be375ed6c1fbbdefcae9b5bdb4f3576b80c8e924 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 880d0ff36c9babb0b0c1bb1a6ccb934d74cfc0bd (diff) | |
| parent | edf72b98a635aa0ed1bf36fe499a8d21c363c1af (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: 53e36247a9 am: edf72b98a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232
Change-Id: Ie3cfd7d4e878fb1c09024291367c9c60df9618f2
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions