tree 92e66056f6105005c66bbe27e3dbbf9891af2fa0
parent c97de79ad268fdc867b618c4a91dc76ce9b61e2b
parent 4ae9a6d5c517f67d9929cc43568c6b7e3b4dfe23
author Stephen Hines <srhines@google.com> 1408392034 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408392034 +0000

am 4ae9a6d5: am 42895561: Merge "Collapse code paths for single- and multi-input kernels."

* commit '4ae9a6d5c517f67d9929cc43568c6b7e3b4dfe23':
  Collapse code paths for single- and multi-input kernels.