diff options
author | Louis Chang <louischang@google.com> | 2021-05-14 17:15:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-14 17:15:11 +0000 |
commit | 57db689823e3b2709c45a138c4149d214c9e8382 (patch) | |
tree | 55618c5554aba6d3e15b1eff5b2751c12d2e12dd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | b81e3635e3965a7938f5fa96f3d9d90ea439a4b0 (diff) | |
parent | 8e9e41c0f19cf843ac1eb12dedc1abed803a5e4e (diff) |
[automerger skipped] Merge "Detects all activities for whether showing work challenge" into rvc-qpr-dev am: 8e9e41c0f1 -s ours
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14170750
Change-Id: I200d54467b6bf120439f16640dc9a6942ecae8d6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions