diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-05 21:42:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 21:42:30 +0000 |
| commit | 15a6879c7535f9d43aea930fe4cea896aa483df1 (patch) | |
| tree | 0a250c212dfaaba097087892200979b73c868f44 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6c33d3ccc7b7e039fd399fdf4cd6781bf2dc0a0b (diff) | |
| parent | e488996c07f5c47bfec4a8d2a19327a7248c32ac (diff) | |
[automerger skipped] Merge "Ensure ProxCheck doesn't unregister ProxSensor" into rvc-dev am: 6bb0f4c6a1 -s ours am: e488996c07 -s ours
am skip reason: Change-Id I3c3faf79ba6d3915b0cfecec7861f6065ae689e8 with SHA-1 63027a63d3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11757752
Change-Id: Ia2815bdb350bcf3a64ae3b308732aec8dc09e182
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions