tree 190baca52d3f5a08c686cdffb5114fcc13d8df41
parent 9f4a3a9d942905ea3bef73477032a7ac40b8fffc
parent 801b51322c7ddfc21cbb4c4900414b6ff8870413
author Jason Sams <jsams@google.com> 1385497739 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385497739 -0800

am 801b5132: Merge "Fix crash running blur on 4K images"

* commit '801b51322c7ddfc21cbb4c4900414b6ff8870413':
  Fix crash running blur on 4K images