tree 20281b962089e6a6748780660238e79e0ba6bce4
parent a42bf4c31b6b96d09414bb3f7ed41a599ceaa1d2
parent 5aaeb8e89eb0afd710ba9586f5e314b76e806116
author Stephen Hines <srhines@google.com> 1407951299 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407951299 +0000

am 5aaeb8e8: am 24a2ee66: Merge "Collapse code paths for single- and multi-input kernels."

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