tree 31930a291c99fe616059e735ef57023eff11a9c7
parent 6f4e48349ce0821ba8f82951c1005e377c62a3cf
parent 51ae136cfcce77c5f496a0cb6e853904c09e95fa
author David Gross <dgross@google.com> 1440672556 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672556 +0000

am 51ae136c: (-s ours) am bc850f9c: am dc52c44c: Merge "Fix rs_kernel_context_t type mismatch in call to kernel."

* commit '51ae136cfcce77c5f496a0cb6e853904c09e95fa':