tree c819f921f5d728f11fdf86b83b278bdfa9406722
parent 692205823076678ecd3c67470b427e4bf2c1ea53
parent 22f4e694c40ce86df26c916a0f0dd65abdc109c3
author Adam Koch <akoch@google.com> 1362517608 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517608 -0800

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

* commit '22f4e694c40ce86df26c916a0f0dd65abdc109c3':