tree 31930a291c99fe616059e735ef57023eff11a9c7
parent fc1392a69f641e35892ac452fc3bacc714303b65
parent 2986056136abf5fc190876b3dbd05546461b0c28
author Stephen Hines <srhines@google.com> 1440672557 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672557 +0000

am 29860561: (-s ours) am 51c5a9da: am 767dd80c: Merge "Fix a bug where kernels could modify the input allocation."

* commit '2986056136abf5fc190876b3dbd05546461b0c28':