diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-08 17:49:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-08 17:49:31 +0000 |
commit | 1c5e6d441a78a2562d48fbf23bf037ae92677df2 (patch) | |
tree | cbdf02969d5d0b1132a3ce044bc9d6fa47346fae /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 401b7edef81898e4e3c2d148c675a72619618174 (diff) | |
parent | b371a1c255150c334e55f50be5257bce969fb20e (diff) |
[automerger skipped] Merge "Do not propogate test api access flags to Zygote." am: 39d22680c9 am: 756d229f09 am: b371a1c255 -s ours
am skip reason: Change-Id I0e58b6924744590afaadec6a6230aa9d552b2f6f with SHA-1 eb05e6c8fa is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558556
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0ede05eea2a25b326bc30fac38d9c5d0771ea0a4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions