diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-28 02:57:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-28 02:57:14 +0000 |
commit | 99a44d857928a356611d5461ca78b1cbe971df8e (patch) | |
tree | 132dd941fee0969d21394d4c5d1cea7e7ad40021 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 1e19bfb91960cf16cbb1287fdaf7334715350e4d (diff) | |
parent | 7cfc3735c5e6dfceeadccd384068ec8e804f9f00 (diff) |
Merge "Add '-unstable' to solve ODR violation" into rvc-dev-plus-aosp am: 2555567ca2 am: 7cab297dc3 am: 7cfc3735c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12377822
Change-Id: If65dbd2062c742d4056bf50441aeb86619d180ce
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions