tree 1cdd480bed6bdad3533d3866a926ef79418f44d7
parent c807070cb54228f1039cd0a3f2fe14efbe46df3e
parent 095aa4b611472f64bdbd1499d05b747cebc3f792
author Adam Koch <akoch@google.com> 1362493933 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362493933 -0800

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

* commit '095aa4b611472f64bdbd1499d05b747cebc3f792':
  Doc fix: update BitmapFactory.Options.inSampleSize javadoc Bug: 8250653