diff options
author | Vishnu Nair <vishnun@google.com> | 2022-02-16 21:23:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-16 21:23:49 +0000 |
commit | 420e6d5a252ea9592069c75f59cc7365dc0b6b38 (patch) | |
tree | b4486d27728a6dc4795b1a088598b88ab84767ee /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a1d372c4ce418511317c7d2e249c6b31b0a02cfb (diff) | |
parent | a5a7ce9f18f6cb72a7e7d98576c642e23e98fcd8 (diff) |
[automerger skipped] Merge "SurfaceControl: Add setDropInputMode api" into rvc-dev am: 5aa3d21693 am: c3db8e7986 -s ours am: 6d94eaaffb -s ours am: a5a7ce9f18 -s ours
am skip reason: Merged-In Ifcb4133306a43874e74e8fb0f42b60842daf6f25 with SHA-1 a84612483f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16502615
Change-Id: Id82f1ad096f579565d32452d2d75cd95599ea5b4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions