diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-05 21:42:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 21:42:20 +0000 |
| commit | 490b37a069b2aef6797c38b8b65b08582080acd0 (patch) | |
| tree | 12ba0a4bd5df8e40a3790721b102f6fcbfaf1b1c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d643d8d88e54f9726f35a901132955f16437dbcc (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: I5545ca0b95232d7cab1714bec66d27cdf9fcf948
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions