tree 3b34b1d9e0b0cec3c18c47080348bc3712f5f6a9
parent 0793c6e84fa841cfc2c802518796b36a7042b5ec
parent 1a5bec0127ca4584008a1ab9e1ce49e671f8387c
author Adam Koch <akoch@google.com> 1362494268 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362494268 -0800

am 1a5bec01: Merge "Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653" into jb-mr1-dev

* commit '1a5bec0127ca4584008a1ab9e1ce49e671f8387c':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653