diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-09 23:44:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-09 23:44:02 +0000 |
| commit | 1d5cdb7d663f622e7480faab376c3c69068e787f (patch) | |
| tree | 605f1efc9f515d726375b67c5670418ee22aef48 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ded45c1552ce0718b9eb0323a3dca0aed9159be8 (diff) | |
| parent | 14ab495fda78eed2bd06b28aa63291f054387c2c (diff) | |
Merge "[automerger skipped] Update requested state after applying pending frames am: dfc8abb1ff -s ours am: 8cac1f2038 -s ours am: 53069a3828 -s ours" into rvc-qpr-dev-plus-aosp am: 14ab495fda -s ours
am skip reason: Change-Id Id8f3c1956fbfe3ad16f167ff76297dde6c634e81 with SHA-1 dfc8abb1ff is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12526908
Change-Id: I9d985bb5c483f39bd7857fe212829586c22ae96e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions