diff options
author | Tiger Huang <tigerhuang@google.com> | 2020-11-16 03:59:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-16 03:59:49 +0000 |
commit | 447c519635a9e25eeb83db97b2e4e0572a1ad7d3 (patch) | |
tree | 4d7b0464f62c97255cdd0629a1608eaca950a271 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6fc96572eb1a0bf09e97524c1e4902cabf474d9d (diff) | |
parent | a0fc352ae24cf834ae0412b11bdff494aed07d0a (diff) |
[automerger skipped] Merge "DO NOT MERGE: Only restore the positions of types which are controlled" into rvc-qpr-dev am: 9649d433d0 am: a0fc352ae2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12967036
Change-Id: I452d04fef066e6871d791ffffa7fa720f9bfd360
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions