tree 4816b3be97bd09a32c5cdd90ea5d8ff30726b38a
parent ad167c2406758ab486ea31b6fcd4daca4c1e6e19
parent fb930be25c6c942ba3d24510f15ef6292897cf13
author The Android Open Source Project <initial-contribution@android.com> 1337183166 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337183166 -0700

am fb930be2: Reconcile with jb-release nakasi-factoryrom-release

* commit 'fb930be25c6c942ba3d24510f15ef6292897cf13':
  Apply ARM patches from NVidia for improved drawing performance.
  Revert "add null check when cropping a bitmap."