tree b155890ca96a910aae2c8042ff276ebb8b9163b6
parent 8e89eb622093b29c10ae260f8d08cee7b721f6f6
parent a8714b7ca4d2b4efcadb47d007d16051ed24c96c
author Jeffrey Vander Stoep <jeffv@google.com> 1563479310 -0700
committer android-build-merger <android-build-merger@google.com> 1563479310 -0700

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

Change-Id: I7a8367f8770f7f343e830a5bcdcdb253d8788963