tree 213a267b6617b8e8ef478c28eddc1f7b76823e26
parent 0fd82f993eb9089f442484f7420c8745c52c94f6
parent 4c9037094aad3251bc20ba74afae2f5c95092e3c
author Miao Wang <miaowang@google.com> 1496447150 +0000
committer android-build-merger <android-build-merger@google.com> 1496447150 +0000

Merge "[RenderScript] Use OVERRIDE_RS_DRIVER string in the default implementation." am: 292cddf6be am: 0a8c6b55cf
am: 4c9037094a  -s ours

Change-Id: Ibbbf9dc4780190850214b6431d9be0a9eb849375