tree aa5e616aad273fb32b882ab7927ceef9fdbf3b6f
parent 4cea01fa3b2185c3b398fbea9df576e42f500aec
parent 5d312ea145a587b6ab25b11475a677b40a489568
author Stephen Hines <srhines@google.com> 1408391575 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408391575 +0000

am 5d312ea1: Merge "Collapse the code paths for single- and multi-input kernels."

* commit '5d312ea145a587b6ab25b11475a677b40a489568':
  Collapse the code paths for single- and multi-input kernels.