tree 31930a291c99fe616059e735ef57023eff11a9c7
parent 120de739a59ccea42f4225d0a2d504684b5c3636
parent 434917b0125bcb2a638697eb21cb3d89a0ad8f24
author Matt Wala <wala@google.com> 1440672559 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672559 +0000

am 434917b0: (-s ours) am a38e29ba: Fix a bug where kernels could modify the input allocation.

* commit '434917b0125bcb2a638697eb21cb3d89a0ad8f24':