tree 965c6738611279e208cf244ad29798a1dc3616a2
parent ec89c1ea731256cd0d71ee58733b2855e1e6e4fa
parent 26f1a53838b2c8b77c0995801dcc1c7816c47f16
author Miao Wang <miaowang@google.com> 1425773221 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425773221 +0000

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

* commit '26f1a53838b2c8b77c0995801dcc1c7816c47f16':
  [RenderScript] Add missing variable