diff options
author | Rob Carr <racarr@google.com> | 2021-01-26 20:37:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-26 20:37:47 +0000 |
commit | 319528973805c23d003669787e309f57e0cc931e (patch) | |
tree | eaa13f837d70d3ac5d6c418752c7ed2e1a48addb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 22a8a7db8cb212191395d3a700d2a7d2142c98a2 (diff) | |
parent | b7802cf79e00449e5c5b43e374721a4c3bc178c0 (diff) |
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-dev am: 525770f7e8 am: 9089b9f175 -s ours am: bc0cd4a148 am: b7802cf79e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13205849
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5144bed0b8f27656f8af1d71f136ae5d851970b4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions