diff options
| author | Rob Carr <racarr@google.com> | 2021-01-26 20:38:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-26 20:38:47 +0000 |
| commit | 08d66983dff9d2201fff3f519ff0c513e94d7363 (patch) | |
| tree | eaa13f837d70d3ac5d6c418752c7ed2e1a48addb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | be516561356ceefb7bc2f4c8f236da9a512cec0c (diff) | |
| parent | aad0ef5fffb48aeab7e09f271ab56330e52bee81 (diff) | |
[automerger skipped] Merge "DO NOT MERGE: WM: Only allow system to use NO_INPUT_CHANNEL." into oc-mr1-dev am: e3f7644490 -s ours am: aa682dec92 -s ours am: a22cfe0b46 am: d3eb04e729 -s ours am: 03ca6d9014 am: aad0ef5fff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13210727
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I813b79b5515c096cd15a087713ccad96969daadb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions