tree 7c3608ea106b748b966f397a9fef56716c42229e
parent 12d8a860b847170b3a751682efa151512e016542
parent 449571c45e47e9b8d118c59dbd909b0d512f7e6d
author Miao Wang <miaowang@google.com> 1425773847 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425773847 +0000

am 449571c4: am 26f1a538: am 8b86ee9f: Merge "[RenderScript] Add missing variable"

* commit '449571c45e47e9b8d118c59dbd909b0d512f7e6d':
  [RenderScript] Add missing variable