tree 43955037edfd35289a2d4698d5f7bc8059f7d97a
parent f0a06d5dbe975ca314cccbb5080121239f1c1d59
parent 89332de6f81bc55baca9b9796624ee9267cdda6a
author Adam Koch <akoch@google.com> 1362517799 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517799 -0800

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

* commit '89332de6f81bc55baca9b9796624ee9267cdda6a':