tree b155890ca96a910aae2c8042ff276ebb8b9163b6
parent 932a9457215cce5798d3554556de7bc2321548fe
parent b77682993cdfde42a499baadeebf9e95cf364dab
author Jeffrey Vander Stoep <jeffv@google.com> 1563477215 -0700
committer android-build-merger <android-build-merger@google.com> 1563477215 -0700

[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript"
am: b77682993c -s ours
am skip reason: change_id I53417fc10c589a845e1cefe8d41f71f8a8de1097 with SHA1 932a945721 is in history

Change-Id: I1d195cd2413f0589512eb5ccf56245f04a8a64fd