diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-15 19:46:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-15 19:46:02 +0000 |
| commit | 3becaf0ebccdbecc0058c324a502aac8ea3f6576 (patch) | |
| tree | 7f2ef5298b426bf5a1e16e4260bbfde8f0b5e709 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cae6ddb11d77cfc34abb5fb895b8b1361f67a414 (diff) | |
| parent | fe4a056593d693c58e4306371f1f44346e68a502 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Remove floating cards launcher" into rvc-qpr-dev am: 6e816f4425 -s ours am: fe4a056593 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13327109
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3624de9276fd1c4ef41f614cffdc1920aaad722c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions