diff options
| author | Julia Reynolds <juliacr@google.com> | 2020-06-03 17:35:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 17:35:13 +0000 |
| commit | 2d1d3b68c910d0f9efdccd4b0a6d69073197a0dd (patch) | |
| tree | 2489c9d864368707955bc9b5f5696f95f3d6c902 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c43dc88787008dcba794e8c2df7c3e17a462bbaa (diff) | |
| parent | 12e1e3a59ee4f6affa56023d600e2e6ba38445ce (diff) | |
[automerger skipped] Merge "DO NOT MERGE Make intents immutable" into pi-dev am: 7f07c974df -s ours am: b93669427e -s ours am: fda6e8314e -s ours am: 6303b95446 -s ours am: 0399778603 -s ours am: 927e567148 -s ours am: 12e1e3a59e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11630371
Change-Id: Idda3084ca60518b3a111958b5b8924c8b48730b3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions