[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" into stage-aosp-master
am: 66d58f59 -s ours am skip reason: change_id I33010b5604d8140f3a50845c16daff743504c8d0 with SHA1 86fdb97c is in history Change-Id: I48a9493c114850e3e2fe26117acc2db0e900b93d
Loading
Please register or sign in to comment