commit | 06b462e6bac4cf5c96ce1c606d2d0cfaf17a3922 | [log] [tgz] |
---|---|---|
author | Jeff Vander Stoep <jeffv@google.com> | Wed Jul 17 23:27:42 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 17 23:27:42 2019 -0700 |
tree | 832f774c7fc84483b6de19749efa9b34f6a1df3a | |
parent | dd7a0861fbb5f17d7f57f5745a3b0103a66f021e [diff] | |
parent | 1f3180e6ce96d4d8b407c9e3258899cf77f8d99e [diff] |
[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" into stage-aosp-master am: 66d58f5925 -s ours am: f5b0727d72 -s ours am: 1f3180e6ce -s ours am skip reason: change_id I33010b5604d8140f3a50845c16daff743504c8d0 with SHA1 86fdb97cbb is in history Change-Id: I583ce807abb76716740262f6301e305caa00e49d