diff options
| author | Dave Mankoff <mankoff@google.com> | 2019-09-19 15:28:40 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-19 15:28:40 -0700 |
| commit | 12274923e4df118cfd05e50179d5f940221d6b46 (patch) | |
| tree | 5774304e4fcb5bbf3372fd533018bd0f9d3ae413 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a18d21345eb94382828c43df3a5d174dd9a2e9eb (diff) | |
| parent | c507eb7ae2c8d63380a0c3f94f3d06215b9a29ef (diff) | |
[automerger skipped] Merge "Add new ProximitySensor wrapper that automatically uses appropriate sensor." into qt-qpr1-dev am: a9667ff3ab
am: c507eb7ae2 -s ours
am skip reason: change_id Id151ce8f702f7deadab73ee3904a0a883870b237 with SHA1 84fa27056b is in history
Change-Id: I625ee6f34f8958294e8cccaa6a8a4992495c88ef
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions