OSDN Git Service

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


Trivial merge