diff options
| author | Shuo Qian <shuoq@google.com> | 2020-11-12 23:33:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-12 23:33:49 +0000 |
| commit | 87abb24859da89f8585a70d02f6662abe6d7bfa1 (patch) | |
| tree | f66ea8be4c59c3539b5a14dd3225f9ee19442e6f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ea6c3d5dd785008d74d78caaf3c55ebd50cdcc5c (diff) | |
| parent | 7779d92cee316c27febbcd66800d72734b2c25d6 (diff) | |
[automerger skipped] Merge "Introduce hasCompanionInCallServiceAccess API" am: 83cc1b62f0 am: 8a37624fe2 am: 94d349257b am: 7779d92cee -s ours
am skip reason: Change-Id Id659bfae8556e965d3c31613848bde808f28a858 with SHA-1 4d0652699a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495021
Change-Id: I33d518f23cdd0cc8cd0af72811d08d3b18fd6beb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions