tree 4edb22fb6ae2ed864cfc345aac718657ba673656
parent 0e1c35ac302486fb62f27517792ff32b90e9a803
parent 38dbcd1997c078d1cb87c667dcfcf60deb01b40f
author Mark Lu <marklu@google.com> 1482171348 +0000
committer android-build-merger <android-build-merger@google.com> 1482171348 +0000

Merge "docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed am: c9328c18a4" into nyc-mr2-dev-plus-aosp
am: 38dbcd1997

Change-Id: I4f9ae27d4a3a5fceadda582fe83e50407bf5fc94