diff options
| author | Rob Carr <racarr@google.com> | 2021-01-26 20:38:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-26 20:38:26 +0000 |
| commit | be516561356ceefb7bc2f4c8f236da9a512cec0c (patch) | |
| tree | eaa13f837d70d3ac5d6c418752c7ed2e1a48addb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 319528973805c23d003669787e309f57e0cc931e (diff) | |
| parent | 7153136e74ca2883d8becc11ffb05f0af29bdea2 (diff) | |
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into pi-dev am: 4f162df18e -s ours am: bbd4d45090 am: 74f95bbb51 -s ours am: b8e01656c0 am: 7153136e74 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13206662
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic06a9afa0c6eea8bd316234b059bb6ff299a1268
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions