tree 64956bca9d8ee3f91169516af235956162b8a87c
parent 37308e374adf190822ce66583d0626b932c1a71c
parent 9ae3b219ca987dbea5c365ea0e0f9a1879523cf8
author Pirama Arumuga Nainar <pirama@google.com> 1477505818 +0000
committer android-build-merger <android-build-merger@google.com> 1477505818 +0000

Merge "RenderScript-specific build updates for LLVM rebase" am: 9e73fb6332 am: 97f259ec41 am: 9570b53f9c
am: 9ae3b219ca

Change-Id: I2e7a9f802b8e30bcff4956103a8a4602d5009281