tree 6a561f5379c73c4eb7ba64915284437755028320
parent 992538f8036b2500f407573b2b38f575b8d351ff
parent 3ad90a45c59311a72deec8312e667a75822622d5
author Jeffrey Vander Stoep <jeffv@google.com> 1563480825 -0700
committer android-build-merger <android-build-merger@google.com> 1563480825 -0700

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

Change-Id: I1758749fd73e54c55a8200ea880453358684fab6