diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-04-07 00:16:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-07 00:16:29 +0000 |
| commit | 2ab56508dce25c266f65b9d97cb6cf8d3411342c (patch) | |
| tree | cd336194cd45137ebbf0f5fac05072182475d920 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 18a459822e5cb94dd9f91162e3ce6f796023dbf0 (diff) | |
| parent | 58e958133f04a2e9f55db82d96c767595d6d9f4f (diff) | |
[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am: 58e958133f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088
Change-Id: I21dbbd1657b46707bfc166aaf0e15cbbcccc9df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions