[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" am: c799747103 -s ours (41c6f6c9) · Commits · Android-smartphones / realme / realme 5pro / kaderbava / evolution_frameworks_base

Commit 41c6f6c9 authored Jul 18, 2019 by Jeffrey Vander Stoep Committed by android-build-merger Jul 18, 2019

[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" am: c7997471 -s ours

am: e5917770 -s ours
am skip reason: change_id Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc with SHA1 bbb75b12 is in history

Change-Id: Ib01eed6e0284a2f12c224807c3972e4bac174769

parents adc4d87d e5917770

Hide whitespace changes

Inline Side-by-side

Please register or to comment