tree b1cb11436754aa2785467870c7947a76532b0edd
parent a61832c8fdff8cf086113f578032136c81935904
parent 8b86ee9fb5909a95a46907aede4d1b22b4ef3bba
author Miao Wang <miaowang@google.com> 1425603743 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425603743 +0000

am 8b86ee9f: Merge "[RenderScript] Add missing variable"

* commit '8b86ee9fb5909a95a46907aede4d1b22b4ef3bba':
  [RenderScript] Add missing variable