diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2020-11-05 23:59:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-05 23:59:02 +0000 |
| commit | 1091e697e525637ebe81e104169cc720fbe8453f (patch) | |
| tree | 96cfeba1dc592785b1cfb46eb357b49e9b2e7a6f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 95e51360e0d303c9c8ee909e2808d7164eae8d85 (diff) | |
| parent | 38540db91399d284a143ba423383fceac20f2e2a (diff) | |
[automerger skipped] Merge changes from topic "12933477" into rvc-dev am: 6a6a15d595 am: 38540db913 -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 764e41b053 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12986657
Change-Id: Ieb569245d80c5478f4c6c4b02314d6cc3065c5b3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions