Skip to content
Commit 90c367ae authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by android-build-merger
Browse files

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

[automerger skipped] Renderscript: rename .rs extension to .rscript am: b4990fa6 -s ours am: 7fdff640 -s ours
am: 74ac9454 -s ours
am skip reason: change_id Ic49fc7f5265d49cd4f8efd6a2b6a60b77bbd40dc with SHA1 e98dce08 is in history

Change-Id: I399ab5506c4375f0fe8c95c786c4b833c07894e6
parents 904cd578 74ac9454
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