diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 09:59:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 09:59:17 +0000 |
| commit | 139e752d3e639ebf6d909c72d9f1ba784d83f7a8 (patch) | |
| tree | 11a24fcb395fa768ceacf4e290ad3ae79d4534b2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 742ba7a5b50a2d8ed0097ff6e70ce18742fd9c24 (diff) | |
| parent | 3d3389fbac10e75cc52da9a4ec3c84af39f48cd3 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 34ddad6f0a -s ours am: 15d348e4c5 am: 3d3389fbac -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11367770
Change-Id: Ic1fb1bbf38784fe03612cf65a4bc33032a4d5b7e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions