diff options
author | Almaz Mingaleev <mingaleev@google.com> | 2020-11-27 20:08:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-27 20:08:04 +0000 |
commit | 4d1cc9ca4d4247fd2892fca8b1985e414319ac04 (patch) | |
tree | 824d7de42a0f91991ed05c12746cd86a4ddbcb17 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6969dbf6d3cf276a51f66e19ecdb3ae9dbc393eb (diff) | |
parent | abab23f3f6f9dbdb49b033648c3fd1e629b4605c (diff) |
[automerger skipped] Merge "Prepare to make time detection more configurable" am: ebec38b952 am: 0f61a4acda am: abab23f3f6 -s ours
am skip reason: Change-Id Id1652be174b7503618e0b802dc7da4d00df4f248 with SHA-1 e96de768f4 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513289
Change-Id: I0392049a1dd414959ff449d6ea00e21cbea51980
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions