diff options
author | Rob Carr <racarr@google.com> | 2021-01-26 20:36:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-26 20:36:59 +0000 |
commit | a0035590aa0bb6233a2821e54ce82be853a55cef (patch) | |
tree | eaa13f837d70d3ac5d6c418752c7ed2e1a48addb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5e2ea0f7a27527de62ca59210f0a5e84eb1f5092 (diff) | |
parent | fa7eadf02efa0e9689e87b36b9a9921c88eeaa43 (diff) |
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into qt-qpr1-dev am: 735a40b06b -s ours am: e058131d53 am: fa7eadf02e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211149
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1389917717d514a503ab32cb4f38b9b59eddb443
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions