diff options
author | Jeff Sharkey <jsharkey@google.com> | 2018-08-08 20:42:52 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-08 20:42:52 -0700 |
commit | 36849e9067c3c19b2295aa58b46c18bb6a2ea400 (patch) | |
tree | 480896c3ec36d3a7da0d5c95e627740354011b88 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | bdc4e6d81694d59098934a6e3990d5ecb15203c0 (diff) | |
parent | 43f18d5062d02ccc8845486170a50f3f39be02e0 (diff) |
[automerger skipped] Merge "DO NOT MERGE. Persistable Uri grants still require permissions." into pi-dev am: 71b35bcedd
am: 43f18d5062 -s ours
Change-Id: I8a2c021a46e1d031a8de58734a988514554c563f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions