tree 18ef3e0984faf48a699ddeaa425631b01a2548e9
parent c27ebda05e89e927a97f275791ab807743134a42
parent b75dc06bbe2fdff1a4c9baa69eb92a849c22715d
author Stephen Hines <srhines@google.com> 1407951780 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407951780 +0000

am b75dc06b: am 4179e889: Merge "Revert "Collapse code paths for single- and multi-input kernels.""

* commit 'b75dc06bbe2fdff1a4c9baa69eb92a849c22715d':
  Revert "Collapse code paths for single- and multi-input kernels."