tree e05d3e941559df2e203f14d95938e76c912c986a
parent f5b0727d72a1c525f01bf10a31864382faa6f70a
parent a789bd6188cffd538153eac1c4498ce757df3ed0
author Jeff Vander Stoep <jeffv@google.com> 1563478147 -0700
committer android-build-merger <android-build-merger@google.com> 1563478147 -0700

[automerger skipped] Renderscript: rename .rs extension to .rscript am: 6235cd99df -s ours
am: a789bd6188 -s ours
am skip reason: change_id I10a23ceee696df7fe363cc5d825e45100565cbdf with SHA1 623d087c54 is in history

Change-Id: I49a8eeab7a357483c6f5c78dd30802e44940a905