diff options
| author | Roland Levillain <rpl@google.com> | 2021-02-11 13:28:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-11 13:28:00 +0000 |
| commit | 6d56b6db810e063cc48c72c3ac286beb593ce460 (patch) | |
| tree | bfbcd568479eff49301df64eea631139fc0f0efe /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d26bc5550a7cd401bd24527bb22cd0711a9c89d2 (diff) | |
| parent | c455df115bb7f8ebd4d841873ad95b05d311de98 (diff) | |
[automerger skipped] Merge changes from topic "int32ref" am: 2d29d2d82b am: 4212e4479f am: c455df115b -s ours
am skip reason: Change-Id I9b63146ae563ed977f3112c9910f7a7c575de0b8 with SHA-1 ac711f9fbf is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566390
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8cfca5ee873f7b1eb8bba76d63af6b66b0f453e4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions