OSDN Git Service

am 957ec05e: am 70a3c558: Merge "Adds support for multi-input kernels to Frameworks...
authorStephen Hines <srhines@google.com>
Tue, 8 Jul 2014 21:29:14 +0000 (21:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Jul 2014 21:29:14 +0000 (21:29 +0000)
* commit '957ec05ef67b5909e9e66bcf28eae29c2dc148b3':
  Adds support for multi-input kernels to Frameworks/Base/RS.


Trivial merge