diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-24 21:38:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-24 21:38:04 +0000 |
| commit | f5a469958e2888ef05756fedc020e2c43a65c7bc (patch) | |
| tree | 60901884a25878966c170ec69029fd2ed5a93abb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ef425dd536c0184d5be1cc56fe6028c71c0def9f (diff) | |
| parent | c048341e5a19714918d6a8713caca8c9df5e0739 (diff) | |
Merge "Merge "Fix unintended preferred activity reset" into rvc-dev am: 69b18e57fc am: a08113255b am: ca45c2bf49" into rvc-qpr-dev-plus-aosp am: c048341e5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12220605
Change-Id: Ia2d84236a2a0f14a8881427919366a5a3a192976
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions