diff options
author | Jeff Sharkey <jsharkey@google.com> | 2020-12-16 04:46:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-16 04:46:56 +0000 |
commit | a2ae18c4cc9f86e94c4d14dfbd35fc4a319c1017 (patch) | |
tree | 6abd6811d93f17ae3d06d6a849fdabc5bfd0059d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 20d0f38f5ff1936db4e23fe39964a48bc2568173 (diff) | |
parent | bcfe028bff3fb370498be33cdc1c5339776ac6a5 (diff) |
Merge "Remove "set noparent" in blobstore OWNERS file" am: be6079bd17 am: bcfe028bff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530324
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I14fe9c44fe58fc72adce78c3ace09572b58bf1b3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions