| commit | fc1392a69f641e35892ac452fc3bacc714303b65 | [log] [tgz] |
|---|---|---|
| author | David Gross <dgross@google.com> | Thu Aug 27 10:49:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:49:16 2015 +0000 |
| tree | 31930a291c99fe616059e735ef57023eff11a9c7 | |
| parent | 6f4e48349ce0821ba8f82951c1005e377c62a3cf [diff] | |
| parent | 51ae136cfcce77c5f496a0cb6e853904c09e95fa [diff] |
am 51ae136c: (-s ours) am bc850f9c: am dc52c44c: Merge "Fix rs_kernel_context_t type mismatch in call to kernel." * commit '51ae136cfcce77c5f496a0cb6e853904c09e95fa':