diff options
author | Patrick Huang <pinchin@google.com> | 2019-03-20 19:12:51 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-03-20 19:12:51 -0700 |
commit | 297210eae99f8d96863bc63efd85db2ab23664b2 (patch) | |
tree | 87da954f68233cc072f5d72934102309203bc918 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 9609c2c2a1f730d8e32543b78227891d5cc45c2a (diff) | |
parent | 4569889818b7ca05301adf4fc9270ba11f2f9fd5 (diff) |
[automerger skipped] Merge "Document permissions for euicc privileged actions." am: 7e2e333769 am: fd5caa2de4
am: 4569889818 -s ours
am skip reason: change_id I285597e48e97f1b4ffe4b4eb4ac68010905f4e1f with SHA1 8002fe449f is in history
Change-Id: I31b920febf168da8a8b2ef7165b8c5ce16fb2ed6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions