tree 9bd05783f1a50b6b44ec44a966f84de306dd90e5
parent 936e87e12dd1335c6f773705fd0a7edb32bc4385
parent 112d1b94ee8456dba16842e6b964eb35aef95818
author Jason Sams <jsams@google.com> 1397754130 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397754130 +0000

am 112d1b94: Merge "Add BiCubic resize instrinsic"

* commit '112d1b94ee8456dba16842e6b964eb35aef95818':
  Add BiCubic resize instrinsic