Skip to content
Commit e5917770 authored by Jeffrey Vander Stoep's avatar Jeffrey Vander Stoep Committed by android-build-merger
Browse files

[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" 

am: c7997471 -s ours
am skip reason: change_id Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc with SHA1 b4990fa6 is in history

Change-Id: I79ba6883c94401d5449490a4eff5bd2255dbc220
parents b4990fa6 c7997471
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment