diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 22:05:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 22:05:54 +0000 |
| commit | 06761cba71fe5abc7f746922dadca3eedcd0e92e (patch) | |
| tree | 0a250c212dfaaba097087892200979b73c868f44 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dcce395cfe2cb00b17dfd9386ef3fdf0e4e51e6a (diff) | |
| parent | 4c4c29d89fb8a2fd38f9854d3501a1f333deec54 (diff) | |
Merge "[automerger skipped] Merge "Ensure ProxCheck doesn't unregister ProxSensor" into rvc-dev am: 6bb0f4c6a1 -s ours am: e488996c07 -s ours" into rvc-d1-dev-plus-aosp am: 4c4c29d89f -s ours
am skip reason: Change-Id I3c3faf79ba6d3915b0cfecec7861f6065ae689e8 with SHA-1 f54f3eb275 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11757752
Change-Id: I4fd7d33a951ce3e1df02dda4524a3e8aa26c3bb5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions