tree a684b0a81d0c7370c96194131ee8a373f072742d
parent ed134c99b2996371d3837be45a78899203719602
parent a63a6d593eecc4f0814abcc526d2768008815054
author Jeffrey Vander Stoep <jeffv@google.com> 1563404639 -0700
committer android-build-merger <android-build-merger@google.com> 1563404639 -0700

Merge "Renderscript: rename .rs extension to .rscript" into qt-dev-plus-aosp
am: a63a6d593e

Change-Id: I4fd19a76de00ea8575e54fba545328aade41b457