tree 28e3e65a06ff331f2c75bc1dc1524e012173641a
parent f39c1088f08e194a212f55a246bac85036f62a42
parent 22c2d52712248e5db4e2ecddbdcac64e9538a5b0
author Chris Banes <chrisbanes@google.com> 1363044540 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363044540 -0700

am 22c2d527: am 56eb96fc: am ac5a7844: am c5d5c3db: Merge "bitmapfun: Add support to use inBitmap option" into jb-mr1-dev

* commit '22c2d52712248e5db4e2ecddbdcac64e9538a5b0':