[automerger skipped] Renderscript: rename .rs extension to .rscript am: 642dbf7eb9 -s ours
am: 46bbbc6618 -s ours
am skip reason: change_id I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c with SHA1 0b7e33a329 is in history

Change-Id: Iaafd8a3dcc638c139a9a85c41a3da647f462e039
tree: 6a561f5379c73c4eb7ba64915284437755028320
  1. apps/
  2. build/
  3. util/
  4. .gitignore
  5. README