diff options
author | Danny Epstein <depstein@google.com> | 2021-01-13 00:48:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-13 00:48:48 +0000 |
commit | 3dd647305e687f191a2f29db85fcc4eccf48b416 (patch) | |
tree | 58877a3629d2ecbf9f6c30476500e7aeeb8a411f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4dfd820998a38a7d75233f89a357daa5b2d174a7 (diff) | |
parent | 3cbb779954ecb45a0b5fc2f14fd40b65cd266f80 (diff) |
[automerger skipped] Merge "DO NOT MERGE Focus clock by default" into rvc-qpr-dev am: d77d372dc7 am: 3cbb779954 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13223231
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I37067cbba5101afe0c057ab20606c7a99c97d45a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions