tree 6a561f5379c73c4eb7ba64915284437755028320
parent 46bbbc661829bedc191d85f39bea44bc92325fb7
parent 8200882f623b2a1023a221ad36b0f2db6282ee30
author Jeffrey Vander Stoep <jeffv@google.com> 1563478230 -0700
committer android-build-merger <android-build-merger@google.com> 1563478230 -0700

[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" am: 8272e7ad1e -s ours
am: 8200882f62 -s ours
am skip reason: change_id I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c with SHA1 642dbf7eb9 is in history

Change-Id: I21d0ef96b5f61ce1c3535d4e1df830db752643f5